Skip to content

Commit

Permalink
Windows: Switch wrapper-less CROSSTOOL to default
Browse files Browse the repository at this point in the history
set USE_MSVC_WRAPPER=1 if you still want to use wrapper script.

RELNOTES:
Windows: Wrapper-less CROSSTOOL becomes default now.
set USE_MSVC_WRAPPER=1 if you still want to use wrapper script.
PiperOrigin-RevId: 161654018
  • Loading branch information
meteorcloudy authored and laszlocsomor committed Jul 12, 2017
1 parent 9a444d4 commit 425f249
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tools/cpp/windows_cc_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ def _get_crt_library(repository_ctx, debug = False):
return crt_library + ".lib"


def _is_no_msvc_wrapper(repository_ctx):
"""Returns True if NO_MSVC_WRAPPER is set to 1."""
def _is_use_msvc_wrapper(repository_ctx):
"""Returns True if USE_MSVC_WRAPPER is set to 1."""
env = repository_ctx.os.environ
return "NO_MSVC_WRAPPER" in env and env["NO_MSVC_WRAPPER"] == "1"
return "USE_MSVC_WRAPPER" in env and env["USE_MSVC_WRAPPER"] == "1"


def _get_compilation_mode_content():
Expand Down Expand Up @@ -324,7 +324,7 @@ def configure_windows_toolchain(repository_ctx):
escaped_cxx_include_directories = []
compilation_mode_content = ""

if not _is_no_msvc_wrapper(repository_ctx):
if _is_use_msvc_wrapper(repository_ctx):
if _is_support_whole_archive(repository_ctx, vc_path):
support_whole_archive = "True"
else:
Expand Down

0 comments on commit 425f249

Please sign in to comment.