Fix BwB in Xcode 14.0.0 Beta 1

brentleyjones · brentleyjones · commit 2f7a9583c3c2 · 2022-06-08T17:20:13.000-05:00
diff --git a/examples/ios_app/test/fixtures/bwb.xcodeproj/project.pbxproj b/examples/ios_app/test/fixtures/bwb.xcodeproj/project.pbxproj
@@ -1598,6 +1598,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_EXEC = "$(BAZEL_INTEGRATION_DIR)/swiftc.py";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_USE_INTEGRATED_DRIVER = NO;
 				TARGET_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)";
 				USE_HEADERMAP = NO;
 				VALIDATE_WORKSPACE = NO;
diff --git a/test/fixtures/cc/bwb.xcodeproj/project.pbxproj b/test/fixtures/cc/bwb.xcodeproj/project.pbxproj
@@ -761,6 +761,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_EXEC = "$(BAZEL_INTEGRATION_DIR)/swiftc.py";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_USE_INTEGRATED_DRIVER = NO;
 				TARGET_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)";
 				USE_HEADERMAP = NO;
 				VALIDATE_WORKSPACE = NO;
diff --git a/test/fixtures/command_line/bwb.xcodeproj/project.pbxproj b/test/fixtures/command_line/bwb.xcodeproj/project.pbxproj
@@ -1076,6 +1076,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_EXEC = "$(BAZEL_INTEGRATION_DIR)/swiftc.py";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_USE_INTEGRATED_DRIVER = NO;
 				TARGET_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)";
 				USE_HEADERMAP = NO;
 				VALIDATE_WORKSPACE = NO;
diff --git a/test/fixtures/generator/bwb.xcodeproj/project.pbxproj b/test/fixtures/generator/bwb.xcodeproj/project.pbxproj
@@ -2358,6 +2358,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_EXEC = "$(BAZEL_INTEGRATION_DIR)/swiftc.py";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_USE_INTEGRATED_DRIVER = NO;
 				TARGET_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)";
 				USE_HEADERMAP = NO;
 				VALIDATE_WORKSPACE = NO;
diff --git a/test/fixtures/multiplatform/bwb.xcodeproj/project.pbxproj b/test/fixtures/multiplatform/bwb.xcodeproj/project.pbxproj
@@ -2061,6 +2061,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_EXEC = "$(BAZEL_INTEGRATION_DIR)/swiftc.py";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_USE_INTEGRATED_DRIVER = NO;
 				TARGET_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)";
 				USE_HEADERMAP = NO;
 				VALIDATE_WORKSPACE = NO;
diff --git a/test/fixtures/tvos_app/bwb.xcodeproj/project.pbxproj b/test/fixtures/tvos_app/bwb.xcodeproj/project.pbxproj
@@ -702,6 +702,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_EXEC = "$(BAZEL_INTEGRATION_DIR)/swiftc.py";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_USE_INTEGRATED_DRIVER = NO;
 				TARGET_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)";
 				USE_HEADERMAP = NO;
 				VALIDATE_WORKSPACE = NO;
diff --git a/tools/generator/src/Generator+CreateProject.swift b/tools/generator/src/Generator+CreateProject.swift
@@ -68,6 +68,7 @@ $(BUILD_DIR)/bazel_build_output_groups
                 "LD": "$(BAZEL_INTEGRATION_DIR)/ld.sh",
                 "LIBTOOL": "$(BAZEL_INTEGRATION_DIR)/libtool.sh",
                 "SWIFT_EXEC": "$(BAZEL_INTEGRATION_DIR)/swiftc.py",
+                "SWIFT_USE_INTEGRATED_DRIVER": "NO",
             ], uniquingKeysWith: { _, r in r })
         }
 
diff --git a/tools/generator/test/CreateProjectTests.swift b/tools/generator/test/CreateProjectTests.swift
@@ -159,6 +159,7 @@ $(INDEXING_DEPLOYMENT_LOCATION__)
                 "INTERNAL_DIR": "$(PROJECT_FILE_PATH)/r_xcp",
                 "SWIFT_EXEC": "$(BAZEL_INTEGRATION_DIR)/swiftc.py",
                 "SWIFT_OPTIMIZATION_LEVEL": "-Onone",
+                "SWIFT_USE_INTEGRATED_DRIVER": "NO",
                 "TARGET_TEMP_DIR": """
 $(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(TARGET_NAME)
 """,

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ $(BUILD_DIR)/bazel_build_output_groups`
`68`	`68`	`"LD": "$(BAZEL_INTEGRATION_DIR)/ld.sh",`
`69`	`69`	`"LIBTOOL": "$(BAZEL_INTEGRATION_DIR)/libtool.sh",`
`70`	`70`	`"SWIFT_EXEC": "$(BAZEL_INTEGRATION_DIR)/swiftc.py",`
	`71`	`+ "SWIFT_USE_INTEGRATED_DRIVER": "NO",`
`71`	`72`	`], uniquingKeysWith: { _, r in r })`
`72`	`73`	`}`
`73`	`74`