From eb565f408e03125e92d42b00756e519795be6593 Mon Sep 17 00:00:00 2001
From: dslomov <dslomov@google.com>
Date: Mon, 15 May 2017 23:16:02 +0200
Subject: [PATCH] Make make sure that msys build actually builds msys version

RELNOTES: None.
PiperOrigin-RevId: 156102527
---
 scripts/ci/windows/compile_windows.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/windows/compile_windows.sh b/scripts/ci/windows/compile_windows.sh
index fe2d3392fc8078..4cafcb75456255 100755
--- a/scripts/ci/windows/compile_windows.sh
+++ b/scripts/ci/windows/compile_windows.sh
@@ -38,10 +38,10 @@ if [ -n "${release_label}" ]; then
 fi
 
 # On windows-msvc-x86_64, we build a MSVC Bazel
-MSVC_OPTS=""
+OPTS="--cpu=x64_windown_msys --host_cpu=x64_windows_msys"
 MSVC_LABEL=""
 if [[ $PLATFORM_NAME == windows-msvc-x86_64* ]]; then
-  MSVC_OPTS="--cpu=x64_windows_msvc --copt=/w"
+  OPTS="--cpu=x64_windows_msvc --host_cpu=x64_windows_msvc --copt=/w"
   MSVC_LABEL="-msvc"
 fi
 
@@ -49,7 +49,7 @@ export MSYS_NO_PATHCONV=1
 export MSYS2_ARG_CONV_EXCL="*"
 ${BOOTSTRAP_BAZEL} --bazelrc=${BAZELRC:-/dev/null} --nomaster_bazelrc build \
     --embed_label=${release_label} --stamp \
-    ${MSVC_OPTS} \
+    ${OPTS} \
     //src:bazel //src:bazel_with_jdk
 
 # Copy the resulting artifacts.