diff options
| author |  Yun Peng <pcloudy@google.com> | 2016-10-17 08:18:02 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-10-17 11:19:42 +0000 |
| commit | 5338f48b54c996265271ba83561fe0a0b9ac43ab (patch) | |
| tree | a0379a5b28130917b98c2fd45e272cdaff05697a /tools | |
| parent | af39f307896cf6f3015c02e312e8218557484af4 (diff) | |
Update MSVC CROSSTOOL to adapt 74b94328db5346e0f6c573731fcbaa85ca751304
--
Change-Id: I46e434e9add5647bd29945ba2f80a399999a4b17
Reviewed-on: https://bazel-review.googlesource.com/#/c/6692
MOS_MIGRATED_REVID=136325160
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index dd82affe9e..082a7becc1 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -297,7 +297,7 @@ toolchain { config_name: 'c++-link-executable' action_name: 'c++-link-executable' tool { - tool_path: 'DUMMY_TOOL' + tool_path: 'wrapper/bin/msvc_link.bat' } implies: 'linkstamps' implies: 'output_execpath_flags' @@ -309,20 +309,21 @@ toolchain { config_name: 'c++-link-dynamic-library' action_name: 'c++-link-dynamic-library' tool { - tool_path: 'DUMMY_TOOL' + tool_path: 'wrapper/bin/msvc_link.bat' } implies: 'shared_flag' implies: 'linkstamps' implies: 'output_execpath_flags' implies: 'input_param_flags' implies: 'global_whole_archive' + implies: 'has_configured_linker_path' } action_config { config_name: 'c++-link-static-library' action_name: 'c++-link-static-library' tool { - tool_path: 'DUMMY_TOOL' + tool_path: 'wrapper/bin/msvc_link.bat' } implies: 'input_param_flags' implies: 'global_whole_archive' @@ -332,7 +333,7 @@ toolchain { config_name: 'c++-link-alwayslink-static-library' action_name: 'c++-link-alwayslink-static-library' tool { - tool_path: 'DUMMY_TOOL' + tool_path: 'wrapper/bin/msvc_link.bat' } implies: 'input_param_flags' implies: 'global_whole_archive' @@ -344,7 +345,7 @@ toolchain { config_name: 'c++-link-pic-static-library' action_name: 'c++-link-pic-static-library' tool { - tool_path: 'DUMMY_TOOL' + tool_path: 'wrapper/bin/msvc_link.bat' } implies: 'input_param_flags' implies: 'global_whole_archive' @@ -354,7 +355,7 @@ toolchain { config_name: 'c++-link-alwayslink-pic-static-library' action_name: 'c++-link-alwayslink-pic-static-library' tool { - tool_path: 'DUMMY_TOOL' + tool_path: 'wrapper/bin/msvc_link.bat' } implies: 'input_param_flags' implies: 'global_whole_archive' @@ -364,11 +365,15 @@ toolchain { config_name: 'c++-link-interface-dynamic-library' action_name: 'c++-link-interface-dynamic-library' tool { - tool_path: 'DUMMY_TOOL' + tool_path: 'wrapper/bin/msvc_link.bat' } } feature { + name: 'has_configured_linker_path' + } + + feature { name: 'shared_flag' flag_set { action: 'c++-link-dynamic-library' |