Skip to content

Commit 38be297

Browse files
committed
Guard emission of variant module behind a flag
1 parent 2196801 commit 38be297

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Sources/SwiftDriver/Jobs/Planning.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ extension Driver {
184184

185185
private mutating func addVariantModuleJobs(addJobBeforeCompiles: (Job) -> Void,
186186
addJobAfterCompiles: (Job) -> Void) throws {
187+
guard parsedOptions.contains(.experimentalEmitVariantModule) else {
188+
return
189+
}
187190
guard variantModuleOutputInfo != nil else {
188191
return
189192
}

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2796,6 +2796,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
27962796
"""
27972797
)
27982798
var driver = try Driver(args: ["swiftc",
2799+
"-experimental-emit-variant-module",
27992800
"-target", "x86_64-apple-macosx10.14",
28002801
"-target-variant", "x86_64-apple-ios13.1-macabi",
28012802
"-clang-target", "x86_64-apple-macosx12.14",
@@ -2900,6 +2901,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
29002901
$0.send("struct Profiler { void* ptr; };")
29012902
}
29022903
var driver = try Driver(args: ["swiftc",
2904+
"-experimental-emit-variant-module",
29032905
"-target", "x86_64-apple-macosx10.14",
29042906
"-target-variant", "x86_64-apple-ios13.1-macabi",
29052907
"-clang-target", "x86_64-apple-macosx12.14",

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4084,7 +4084,7 @@ final class SwiftDriverTests: XCTestCase {
40844084
var driver = try Driver(args: ["swiftc",
40854085
"-target", "x86_64-apple-macosx10.14",
40864086
"-target-variant", "x86_64-apple-ios13.1-macabi",
4087-
"-enable-library-evolution",
4087+
"-enable-library-evolution", "-experimental-emit-variant-module",
40884088
"-emit-module",
40894089
"-emit-module-path", "foo.swiftmodule/target.swiftmodule",
40904090
"-emit-variant-module-path", "foo.swiftmodule/variant.swiftmodule",
@@ -4115,7 +4115,7 @@ final class SwiftDriverTests: XCTestCase {
41154115
var driver = try Driver(args: ["swiftc",
41164116
"-target", "x86_64-apple-macosx10.14",
41174117
"-target-variant", "x86_64-apple-ios13.1-macabi",
4118-
"-enable-library-evolution",
4118+
"-enable-library-evolution", "-experimental-emit-variant-module",
41194119
"-package-name", "Susan",
41204120
"-emit-module",
41214121
"-emit-module-path", "target.swiftmodule",
@@ -4192,7 +4192,7 @@ final class SwiftDriverTests: XCTestCase {
41924192
"-target", "x86_64-apple-macosx10.14",
41934193
"-target-variant", "x86_64-apple-ios13.1-macabi",
41944194
"-emit-variant-module-path", "foo.swiftmodule/x86_64-apple-ios13.1-macabi.swiftmodule",
4195-
"-enable-library-evolution",
4195+
"-enable-library-evolution", "-experimental-emit-variant-module",
41964196
"-emit-module",
41974197
"foo.swift"], env: env)
41984198

@@ -4217,7 +4217,7 @@ final class SwiftDriverTests: XCTestCase {
42174217
"-target", "x86_64-apple-macosx10.14",
42184218
"-target-variant", "x86_64-apple-ios13.1-macabi",
42194219
"-emit-variant-module-path", "foo.swiftmodule/x86_64-apple-ios13.1-macabi.swiftmodule",
4220-
"-enable-library-evolution",
4220+
"-enable-library-evolution", "-experimental-emit-variant-module",
42214221
"-emit-module",
42224222
"-emit-api-descriptor-path", "foo.swiftmodule/target.api.json",
42234223
"-emit-variant-api-descriptor-path", "foo.swiftmodule/variant.api.json",

0 commit comments

Comments
 (0)