bazel
/
rules_cc
mirror of https://github.com/bazelbuild/rules_cc
2
0
Fork 0
Code Issues Releases Activity

Fix rule-based implementation of runtime_library_search_directories 

BEGIN_PUBLIC

Fix rule-based implementation of runtime_library_search_directories

As runtime_library_search_directories was written and reorganized through review, some instances of `$ORIGIN` were unintentionally renamed to `$EXEC_ORIGIN`. This change fixes those instances to correctly mirror CppActionConfigs.java.

END_PUBLIC

BUG: 349427627
PiperOrigin-RevId: 672401255
Change-Id: Ic20f9e77eccca8bc7e7f895aeaeb44f85022df28
This commit is contained in:
Googler 2024-09-08 22:14:21 -07:00 committed by Copybara-Service
parent ca8483971c
commit b8bb882895
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cc/toolchains/args/runtime_library_search_directories/BUILD
View File

@ -77,7 +77,7 @@ cc_nested_args(
"-Xlinker", "-Xlinker",
] + select({ ] + select({
"@platforms//os:macos": ["@loader_path/{search_path}"], "@platforms//os:macos": ["@loader_path/{search_path}"],
"//conditions:default": ["$EXEC_ORIGIN/{search_path}"], "//conditions:default": ["$ORIGIN/{search_path}"],
}), }),
format = { format = {
"search_path": "//cc/toolchains/variables:runtime_library_search_directories", "search_path": "//cc/toolchains/variables:runtime_library_search_directories",
@ -113,7 +113,7 @@ cc_nested_args(
"-Xlinker", "-Xlinker",
] + select({ ] + select({
"@platforms//os:macos": ["@loader_path/{search_path}"], "@platforms//os:macos": ["@loader_path/{search_path}"],
"//conditions:default": ["$EXEC_ORIGIN/{search_path}"], "//conditions:default": ["$ORIGIN/{search_path}"],
}), }),
format = { format = {
"search_path": "//cc/toolchains/variables:runtime_library_search_directories", "search_path": "//cc/toolchains/variables:runtime_library_search_directories",

4
tests/rule_based_toolchain/legacy_features_as_args/goldens/unix/runtime_library_search_directories.textproto
View File

@ -21,7 +21,7 @@ flag_sets {
flags: "-Xlinker" flags: "-Xlinker"
flags: "-rpath" flags: "-rpath"
flags: "-Xlinker" flags: "-Xlinker"
flags: "$EXEC_ORIGIN/%{runtime_library_search_directories}" flags: "$ORIGIN/%{runtime_library_search_directories}"
} }
iterate_over: "runtime_library_search_directories" iterate_over: "runtime_library_search_directories"
} }
@ -43,7 +43,7 @@ flag_sets {
flags: "-Xlinker" flags: "-Xlinker"
flags: "-rpath" flags: "-rpath"
flags: "-Xlinker" flags: "-Xlinker"
flags: "$EXEC_ORIGIN/%{runtime_library_search_directories}" flags: "$ORIGIN/%{runtime_library_search_directories}"
iterate_over: "runtime_library_search_directories" iterate_over: "runtime_library_search_directories"
} }
} }