diff options
| author |  Dmitry Lomov <dslomov@google.com> | 2016-02-15 16:15:03 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-02-16 09:39:56 +0000 |
| commit | 9d40a60efec40add9443edbd75b77cdccbbc43dc (patch) | |
| tree | 5f8db65400fcd5a84cee4678505cff5b9ffb55ac /scripts | |
| parent | fa465f6f6216c5a3202964edf78e085cb19d5195 (diff) | |
On Windows, build ``bazel.exe`` instead of just ``bazel``.
Needed for #276.
--
MOS_MIGRATED_REVID=114693711
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap/buildenv.sh | 7 | ||||
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/scripts/bootstrap/buildenv.sh b/scripts/bootstrap/buildenv.sh index c2b30facf1..63d0897ba7 100755 --- a/scripts/bootstrap/buildenv.sh +++ b/scripts/bootstrap/buildenv.sh @@ -36,6 +36,13 @@ if [ "${MACHINE_TYPE}" = 'arm' -o "${MACHINE_TYPE}" = 'armv7l' -o "${MACHINE_TYP MACHINE_IS_ARM='yes' fi +# Extension for executables. +EXE_EXT="" +case "${PLATFORM}" in +msys*|mingw*) + EXE_EXT=".exe" +esac + ATEXIT_="" function atexit() { ATEXIT_="$1; ${ATEXIT_}" diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index f9e6d31093..9195e7a48c 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -31,9 +31,6 @@ unset _JAVA_OPTIONS LDFLAGS=${LDFLAGS:-""} -# Extension for executables (.exe on Windows). -EXE_EXT="" - MSYS_DLLS="" PATHSEP=":" @@ -76,8 +73,6 @@ darwin) msys*|mingw*) # Use a simplified platform string. PLATFORM="mingw" - # Workaround for msys issue which causes omission of std::to_string. - EXE_EXT=".exe" PATHSEP=";" # Find the latest available version of the SDK. JAVA_HOME="${JAVA_HOME:-$(ls -d /c/Program\ Files/Java/jdk* | sort | tail -n 1)}" |