Windows: Bootstrap Bazel with wrapper-less CROSSTOOL

RELNOTES: None. PiperOrigin-RevId: 160482939
drigz · Jun 29, 2017 · a60fce9 · a60fce9
1 parent 393e843
commit a60fce9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/scripts/ci/windows/compile_windows.sh b/scripts/ci/windows/compile_windows.sh
@@ -41,13 +41,16 @@ fi
 OPTS="--cpu=x64_windows_msys --host_cpu=x64_windows_msys"
 MSVC_LABEL=""
 if [[ $PLATFORM_NAME == windows-msvc-x86_64* ]]; then
-  OPTS="--cpu=x64_windows_msvc --copt=/w"
+  OPTS=""
   MSVC_LABEL="-msvc"
 fi
 
 export MSYS_NO_PATHCONV=1
 export MSYS2_ARG_CONV_EXCL="*"
 
+# TODO(pcloudy): Remove this after wrapper-less CROSSTOOL becomes default
+export NO_MSVC_WRAPPER=1
+
 echo "BOOTSTRAP_BAZEL version:"
 ${BOOTSTRAP_BAZEL} --bazelrc=${BAZELRC:-/dev/null} --nomaster_bazelrc version