diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
3 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java index 49b7bcad42..1aa41edb0f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java @@ -95,8 +95,8 @@ public class CppLinkActionBuilder { /** A build variable for the path where to generate interface library using the builder tool. */ public static final String INTERFACE_LIBRARY_OUTPUT_VARIABLE = "interface_library_output_path"; - /** A build variable for the custom flags specified in the crosstool. */ - public static final String TOOLCHAIN_FLAGS_VARIABLE = "toolchain_flags"; + /** A build variable for hard-coded linker flags currently only known by bazel. */ + public static final String LEGACY_LINK_FLAGS_VARIABLE = "legacy_link_flags"; /** * A build variable that is set to indicate a mostly static linking for which the linked binary * should be piped to /dev/null. diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionConfigs.java index ba90b65dfa..8b8ae161b9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionConfigs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionConfigs.java @@ -67,7 +67,7 @@ public class CppLinkActionConfigs { " implies: 'input_param_flags'", " implies: 'libraries_to_link'", " implies: 'force_pic_flags'", - " implies: 'toolchain_flags'", + " implies: 'legacy_link_flags'", "}", "action_config {", " config_name: 'c++-link-dynamic-library'", @@ -85,7 +85,7 @@ public class CppLinkActionConfigs { " implies: 'library_search_directories'", " implies: 'input_param_flags'", " implies: 'libraries_to_link'", - " implies: 'toolchain_flags'", + " implies: 'legacy_link_flags'", "}", "action_config {", " config_name: 'c++-link-static-library'", @@ -335,14 +335,14 @@ public class CppLinkActionConfigs { " }", "}", "feature {", - " name: 'toolchain_flags'", + " name: 'legacy_link_flags'", " flag_set {", - " expand_if_all_available: 'toolchain_flags'", + " expand_if_all_available: 'legacy_link_flags'", " action: 'c++-link-executable'", " action: 'c++-link-dynamic-library'", " flag_group {", - " iterate_over: 'toolchain_flags'", - " flag: '%{toolchain_flags}'", + " iterate_over: 'legacy_link_flags'", + " flag: '%{legacy_link_flags}'", " }", " }", "}")); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java index 6b5a6ec296..b253826683 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java @@ -385,7 +385,7 @@ public final class LinkCommandLine extends CommandLine { new Variables.Builder() .addAll(variables) .addStringSequenceVariable( - CppLinkActionBuilder.TOOLCHAIN_FLAGS_VARIABLE, getToolchainFlags()) + CppLinkActionBuilder.LEGACY_LINK_FLAGS_VARIABLE, getToolchainFlags()) .build())); break; @@ -397,7 +397,7 @@ public final class LinkCommandLine extends CommandLine { new Variables.Builder() .addAll(variables) .addStringSequenceVariable( - CppLinkActionBuilder.TOOLCHAIN_FLAGS_VARIABLE, getToolchainFlags()) + CppLinkActionBuilder.LEGACY_LINK_FLAGS_VARIABLE, getToolchainFlags()) .build())); break; |