diff options
| -rw-r--r-- | scripts/ci/bazel-tests.json | 5 | ||||
| -rw-r--r-- | scripts/ci/bootstrap.json | 5 | ||||
| -rwxr-xr-x | scripts/ci/windows/compile_windows.sh | 3 |
3 files changed, 2 insertions, 11 deletions
diff --git a/scripts/ci/bazel-tests.json b/scripts/ci/bazel-tests.json index d0a81d599e..c0a2210bfd 100644 --- a/scripts/ci/bazel-tests.json +++ b/scripts/ci/bazel-tests.json @@ -100,10 +100,7 @@ "parameters": { "build_opts": [ "--copt=-w", - "--host_copt=-w", - // TODO(pcloudy):. - // Remove it after wrapper-less CROSSTOOL becomes default - "--action_env=NO_MSVC_WRAPPER=1" + "--host_copt=-w" ], "test_opts": [ // TODO(pcloudy): Remove this after TEMP is properly set. diff --git a/scripts/ci/bootstrap.json b/scripts/ci/bootstrap.json index b229d23eaf..0354218b07 100644 --- a/scripts/ci/bootstrap.json +++ b/scripts/ci/bootstrap.json @@ -91,10 +91,7 @@ ], "opts": [ "--copt=-w", - "--host_copt=-w", - // TODO(pcloudy): - // Remove it after wrapper-less CROSSTOOL becomes default - "--action_env=NO_MSVC_WRAPPER=1" + "--host_copt=-w" ] } } diff --git a/scripts/ci/windows/compile_windows.sh b/scripts/ci/windows/compile_windows.sh index 8bb5cdfb45..ca2817a695 100755 --- a/scripts/ci/windows/compile_windows.sh +++ b/scripts/ci/windows/compile_windows.sh @@ -40,9 +40,6 @@ 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 |