diff options
| author |  dslomov <dslomov@google.com> | 2017-05-15 23:16:02 +0200 |
|---|---|---|
| committer | Dmitry Lomov <dslomov@google.com> | 2017-05-15 23:25:35 +0200 |
| commit | eb565f408e03125e92d42b00756e519795be6593 (patch) | |
| tree | 725cd9d6c585a393e71b3e852fd84b60c37a7d29 | |
| parent | ef27fa56254ad6c0919bcb250a2e8681372ee11a (diff) | |
Make make sure that msys build actually builds msys version
RELNOTES: None.
PiperOrigin-RevId: 156102527
| -rwxr-xr-x | scripts/ci/windows/compile_windows.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/ci/windows/compile_windows.sh b/scripts/ci/windows/compile_windows.sh index fe2d3392fc..4cafcb7545 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. |