Skip to content

Commit

Permalink
Make make sure that msys build actually builds msys version
Browse files Browse the repository at this point in the history
RELNOTES: None.
PiperOrigin-RevId: 156102527
  • Loading branch information
dslomov committed May 15, 2017
1 parent ef27fa5 commit eb565f4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions scripts/ci/windows/compile_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@ 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

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.
Expand Down

0 comments on commit eb565f4

Please sign in to comment.