diff options
author | 2017-06-23 19:19:35 +0200 | |
---|---|---|
committer | 2017-06-26 18:33:31 +0200 | |
commit | b751f056a1513e29d82276b09c381687aff7298e (patch) | |
tree | 85b7aa2e78f463ef6f33513f041ce7d10c6f3f30 | |
parent | f5b8d6fc3b4859515dae6158c96e251bea929128 (diff) |
Get rid of batch script in MSVC CROSSTOOL
Now the MSVC CROSSTOOL can truly be wrapper-free! \o/
RELNOTES: None.
PiperOrigin-RevId: 159962674
-rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 5 | ||||
-rw-r--r-- | tools/cpp/windows_cc_configure.bzl | 5 | ||||
-rw-r--r-- | tools/cpp/windows_cc_wrapper.bat.tpl | 23 |
3 files changed, 0 insertions, 33 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index 9f857c72d8..a65c564217 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -446,7 +446,6 @@ toolchain { implies: 'linkstamps' implies: 'output_execpath_flags' implies: 'input_param_flags' - implies: 'has_configured_linker_path' implies: 'legacy_link_flags' implies: 'linker_param_file' implies: 'msvc_env' @@ -529,10 +528,6 @@ toolchain { } feature { - name: 'has_configured_linker_path' - } - - feature { name: 'shared_flag' flag_set { action: 'c++-link-dynamic-library' diff --git a/tools/cpp/windows_cc_configure.bzl b/tools/cpp/windows_cc_configure.bzl index 99496e569d..aa36ce189e 100644 --- a/tools/cpp/windows_cc_configure.bzl +++ b/tools/cpp/windows_cc_configure.bzl @@ -343,13 +343,8 @@ def configure_windows_toolchain(repository_ctx): "%{cuda_compute_capabilities}": ", ".join( ["\"%s\"" % c for c in escaped_compute_capabilities]), }) - tpl(repository_ctx, "windows_cc_wrapper.bat", { - "%{msvc_cl_path}": msvc_cl_path, - "%{msvc_link_path}": msvc_link_path, - }, "windows_cc_wrapper.bat") if _is_no_msvc_wrapper(repository_ctx): - msvc_cl_path = "windows_cc_wrapper.bat" compilation_mode_content = "" else: msvc_cl_path = "wrapper/bin/msvc_cl.bat" diff --git a/tools/cpp/windows_cc_wrapper.bat.tpl b/tools/cpp/windows_cc_wrapper.bat.tpl deleted file mode 100644 index f086033c48..0000000000 --- a/tools/cpp/windows_cc_wrapper.bat.tpl +++ /dev/null @@ -1,23 +0,0 @@ -:: Copyright 2016 The Bazel Authors. All rights reserved. -:: -:: Licensed under the Apache License, Version 2.0 (the "License"); -:: you may not use this file except in compliance with the License. -:: You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. - -@echo OFF -setlocal enabledelayedexpansion - -if "%USE_LINKER%" == "1" ( - "%{msvc_link_path}" %* - exit !errorlevel! -) - -"%{msvc_cl_path}" %* |