Skip to content

Commit 27bfd6d

Browse files
author
Karim Alweheshy
committed
getting it to runtime until linking error
1 parent 9121e36 commit 27bfd6d

File tree

6 files changed

+8
-15
lines changed

6 files changed

+8
-15
lines changed

examples/integration/test/fixtures/bwb.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/rules_ios/test/fixtures/bwb.xcodeproj/project.pbxproj

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/generators/legacy/src/Generator/CreateProject.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ $(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(COMPILE_TARGET_NAME)
137137
"LD": "$(BAZEL_INTEGRATION_DIR)/ld",
138138
"LDPLUSPLUS": "$(BAZEL_INTEGRATION_DIR)/ld",
139139
"LIBTOOL": "$(BAZEL_INTEGRATION_DIR)/libtool",
140-
"SWIFT_EXEC": "$(BAZEL_INTEGRATION_DIR)/swiftc",
141-
"SWIFT_USE_INTEGRATED_DRIVER": false,
142140
"TAPI_EXEC": "/usr/bin/true",
143141
], uniquingKeysWith: { _, r in r })
144142
} else {

tools/generators/legacy/test/CreateProjectTests.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,9 @@ $(BUILD_DIR)/$(BAZEL_PACKAGE_BIN_DIR)
232232
"RULES_XCODEPROJ_BUILD_MODE": "bazel",
233233
"SRCROOT": directories.workspace.string,
234234
"SUPPORTS_MACCATALYST": false,
235-
"SWIFT_EXEC": "$(BAZEL_INTEGRATION_DIR)/swiftc",
236235
"TAPI_EXEC": "/usr/bin/true",
237236
"SWIFT_OBJC_INTERFACE_HEADER_NAME": "",
238237
"SWIFT_OPTIMIZATION_LEVEL": "-Onone",
239-
"SWIFT_USE_INTEGRATED_DRIVER": false,
240238
"SWIFT_VERSION": "5.0",
241239
"TARGET_TEMP_DIR": """
242240
$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(COMPILE_TARGET_NAME)

tools/generators/pbxproj_prefix/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,8 @@ Here is an example output:
232232
RULES_XCODEPROJ_BUILD_MODE = bazel;
233233
SRCROOT = /tmp/workspace;
234234
SUPPORTS_MACCATALYST = NO;
235-
SWIFT_EXEC = "$(BAZEL_INTEGRATION_DIR)/swiftc";
236235
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
237236
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
238-
SWIFT_USE_INTEGRATED_DRIVER = NO;
239237
SWIFT_VERSION = 5.0;
240238
TAPI_EXEC = /usr/bin/true;
241239
TARGET_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(COMPILE_TARGET_NAME)";
@@ -292,10 +290,8 @@ Here is an example output:
292290
RULES_XCODEPROJ_BUILD_MODE = bazel;
293291
SRCROOT = /tmp/workspace;
294292
SUPPORTS_MACCATALYST = NO;
295-
SWIFT_EXEC = "$(BAZEL_INTEGRATION_DIR)/swiftc";
296293
SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
297294
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
298-
SWIFT_USE_INTEGRATED_DRIVER = NO;
299295
SWIFT_VERSION = 5.0;
300296
TAPI_EXEC = /usr/bin/true;
301297
TARGET_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(BAZEL_PACKAGE_BIN_DIR)/$(COMPILE_TARGET_NAME)";

xcodeproj/internal/bazel_integration_files/copy_outputs.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,17 @@ if [[ "$ACTION" != indexbuild ]]; then
2525
if [[ -n ${BAZEL_OUTPUTS_PRODUCT:-} ]]; then
2626
cd "${BAZEL_OUTPUTS_PRODUCT%/*}"
2727

28+
# Symlink .o files from BAZEL_PACKAGE_BIN_DIR to OBJECT_FILE_DIR_normal/arm64
29+
find "$PWD" -name '*.o' -exec sh -c '
30+
TARGET_FILE="$OBJECT_FILE_DIR_normal/arm64/$(basename "$1" | sed "s/\.swift//")"
31+
rm -f $TARGET_FILE
32+
cp "$1" $TARGET_FILE
33+
' _ {} \;
34+
2835
if [[ -f "$BAZEL_OUTPUTS_PRODUCT_BASENAME" ]]; then
2936
# Product is a binary, so symlink instead of rsync, to allow for Bazel-set
3037
# rpaths to work
31-
ln -sfh "$PWD/$BAZEL_OUTPUTS_PRODUCT_BASENAME" "$TARGET_BUILD_DIR/$PRODUCT_NAME"
38+
ln -sfh "$PWD/$BAZEL_OUTPUTS_PRODUCT_BASENAME" "$TARGET_BUILD_DIR/lib$PRODUCT_NAME.a"
3239
else
3340
# Product is a bundle
3441
rsync \

0 commit comments

Comments
 (0)