diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java index 1bb49fecaa..26f651bc77 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java @@ -597,13 +597,13 @@ public class CppActionConfigs { " flag_group {", ifTrue( supportsEmbeddedRuntimes, - " expand_if_all_available: 'is_cc_test_link_action'", + " expand_if_true: 'is_cc_test'", // TODO(b/27153401): This should probably be @loader_path on osx. " flag: ", " '-Wl,-rpath,$EXEC_ORIGIN/%{runtime_library_search_directories}'", " }", " flag_group {", - " expand_if_all_available: 'is_not_cc_test_link_action'"), + " expand_if_false: 'is_cc_test'"), ifLinux( platform, " flag: '-Wl,-rpath,$ORIGIN/%{runtime_library_search_directories}'"), diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java index a26b8b76cc..7278aa847d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java @@ -75,10 +75,6 @@ public enum LinkBuildVariables { FORCE_PIC("force_pic"), /** Presence of this variable indicates that the debug symbols should be stripped. */ STRIP_DEBUG_SYMBOLS("strip_debug_symbols"), - @Deprecated - IS_CC_TEST_LINK_ACTION("is_cc_test_link_action"), - @Deprecated - IS_NOT_CC_TEST_LINK_ACTION("is_not_cc_test_link_action"), /** Truthy when current action is a cc_test linking action, falsey otherwise. */ IS_CC_TEST("is_cc_test"), /** @@ -149,10 +145,8 @@ public enum LinkBuildVariables { if (useTestOnlyFlags) { buildVariables.addIntegerVariable(IS_CC_TEST.getVariableName(), 1); - buildVariables.addStringVariable(IS_CC_TEST_LINK_ACTION.getVariableName(), ""); } else { buildVariables.addIntegerVariable(IS_CC_TEST.getVariableName(), 0); - buildVariables.addStringVariable(IS_NOT_CC_TEST_LINK_ACTION.getVariableName(), ""); } if (runtimeLibrarySearchDirectories != null) { |