Skip to content

Commit 9b3dfcf

Browse files
committed
Fix: file-prefix-map config on Linux
1 parent ebac64d commit 9b3dfcf

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

swift/toolchains/config/compile_config.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ def compile_action_configs(
511511
],
512512
configurators = [
513513
add_arg("-Xwrapped-swift=-file-prefix-pwd-is-dot"),
514-
add_arg("-file-prefix-map", "__BAZEL_XCODE_DEVELOPER_DIR__=/PLACEHOLDER_DEVELOPER_DIR"),
515514
],
516515
features = [SWIFT_FEATURE_FILE_PREFIX_MAP],
517516
),

swift/toolchains/xcode_swift_toolchain.bzl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,10 @@ def _all_action_configs(
453453
action_configs.extend([
454454
# Xcode path remapping
455455
ActionConfigInfo(
456-
actions = all_compile_action_names(),
456+
actions = all_compile_action_names() + [
457+
SWIFT_ACTION_PRECOMPILE_C_MODULE,
458+
SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
459+
],
457460
configurators = [
458461
add_arg(
459462
"-debug-prefix-map",
@@ -466,6 +469,7 @@ def _all_action_configs(
466469
),
467470
ActionConfigInfo(
468471
actions = all_compile_action_names() + [
472+
SWIFT_ACTION_PRECOMPILE_C_MODULE,
469473
SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
470474
],
471475
configurators = [
@@ -483,18 +487,19 @@ def _all_action_configs(
483487
],
484488
),
485489
ActionConfigInfo(
486-
actions = all_compile_action_names(),
490+
actions = all_compile_action_names() + [
491+
SWIFT_ACTION_PRECOMPILE_C_MODULE,
492+
SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
493+
],
487494
configurators = [
488495
add_arg(
489496
"-file-prefix-map",
490497
"__BAZEL_XCODE_DEVELOPER_DIR__=/PLACEHOLDER_DEVELOPER_DIR",
491498
),
492499
],
493500
features = [
494-
[
495-
SWIFT_FEATURE_REMAP_XCODE_PATH,
496-
SWIFT_FEATURE_FILE_PREFIX_MAP,
497-
],
501+
SWIFT_FEATURE_FILE_PREFIX_MAP,
502+
SWIFT_FEATURE_REMAP_XCODE_PATH,
498503
],
499504
),
500505
])

0 commit comments

Comments
 (0)