aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
diff options
context:
space:
mode:
authorGravatar Marcel Hlopko <hlopko@google.com>2016-12-22 08:48:05 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-12-22 09:58:12 +0000
commit5b6302405b2039f74e2259fa1829cdf7eee7f6ac (patch)
tree4588f4aa69da75fca3bb2598373a16e123d6af4d /src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
parent5374d4fd8ee670b96fe39fe47b04b641c3587342 (diff)
Move hardcoded toolchain linker flags to CROSSTOOL
This cl introduces another build variable: toolchain_flags and updates all the affected crosstools (those which started using action_configs, because the defaults from CppLinkActionConfigs are not applied then). This build variable is a requirement for follow-up refactoring exposing param_files build variable. With toolchain_flags and param_files we will have full control over flags placement on the link command line. -- PiperOrigin-RevId: 142741060 MOS_MIGRATED_REVID=142741060
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java2
1 files changed, 2 insertions, 0 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 6f6939dbb5..49b7bcad42 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,6 +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 that is set to indicate a mostly static linking for which the linked binary
* should be piped to /dev/null.