aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Marcel Hlopko <hlopko@google.com>2017-01-24 10:39:40 +0000
committerGravatar Laszlo Csomor <laszlocsomor@google.com>2017-01-24 10:48:39 +0000
commit46d3632d4a9ba3344e362bfd3f4617635607de0f (patch)
tree7a07b771dc11b63ad8d74cac49d35821042e4e83
parentcb174258b2c660f6df86436ac256d190e76c346a (diff)
Consume linker_param_file build variable in windows crosstool
Fixes #2405 -- PiperOrigin-RevId: 145394624 MOS_MIGRATED_REVID=145394624
-rw-r--r--tools/cpp/CROSSTOOL.tpl30
1 files changed, 30 insertions, 0 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl
index 75c9f88c52..866271fd64 100644
--- a/tools/cpp/CROSSTOOL.tpl
+++ b/tools/cpp/CROSSTOOL.tpl
@@ -339,6 +339,7 @@ toolchain {
implies: 'output_execpath_flags'
implies: 'input_param_flags'
implies: 'legacy_link_flags'
+ implies: 'linker_param_file'
}
action_config {
@@ -353,6 +354,7 @@ toolchain {
implies: 'input_param_flags'
implies: 'has_configured_linker_path'
implies: 'legacy_link_flags'
+ implies: 'linker_param_file'
}
action_config {
@@ -362,6 +364,7 @@ toolchain {
tool_path: 'wrapper/bin/msvc_link.bat'
}
implies: 'input_param_flags'
+ implies: 'linker_param_file'
}
action_config {
@@ -371,6 +374,7 @@ toolchain {
tool_path: 'wrapper/bin/msvc_link.bat'
}
implies: 'input_param_flags'
+ implies: 'linker_param_file'
}
# TODO(pcloudy): The following action_config is listed in MANDATORY_LINK_TARGET_TYPES.
@@ -382,6 +386,7 @@ toolchain {
tool_path: 'wrapper/bin/msvc_link.bat'
}
implies: 'input_param_flags'
+ implies: 'linker_param_file'
}
action_config {
@@ -391,6 +396,7 @@ toolchain {
tool_path: 'wrapper/bin/msvc_link.bat'
}
implies: 'input_param_flags'
+ implies: 'linker_param_file'
}
action_config {
@@ -399,6 +405,7 @@ toolchain {
tool {
tool_path: 'wrapper/bin/msvc_link.bat'
}
+ implies: 'linker_param_file'
}
feature {
@@ -559,6 +566,29 @@ toolchain {
}
}
+
+ feature {
+ name: 'linker_param_file'
+ flag_set {
+ expand_if_all_available: 'linker_param_file'
+ action: 'c++-link-executable'
+ action: 'c++-link-dynamic-library'
+ flag_group {
+ flag: '-Wl,@%{linker_param_file}'
+ }
+ }
+ flag_set {
+ expand_if_all_available: 'linker_param_file'
+ action: 'c++-link-static-library'
+ action: 'c++-link-alwayslink-static-library'
+ action: 'c++-link-pic-static-library'
+ action: 'c++-link-alwayslink-pic-static-library'
+ flag_group {
+ flag: '@%{linker_param_file}'
+ }
+ }
+ }
+
compilation_mode_flags {
mode: DBG
compiler_flag: "/DDEBUG=1"