diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2017-10-06 16:45:05 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-10-06 19:50:43 +0200 |
| commit | e79a1107d90380501102990d82cbfaa8f51a1778 (patch) | |
| tree | b3e9b2ad5170cbe8baae6d394717f309861fc99b /src/main/native | |
| parent | ddc8e0cd770627d3566ffd51f4802a30416e0cfc (diff) | |
Windows,bootstrapping: fix build_windows_jni.sh
Also:
- check as the first thing in compile.sh that we
can locate the GNU coreutils, and remove the
duplicate check for the same thing on Windows
- check early in compile.sh that we can access
python.exe
Fixes https://github.com/bazelbuild/bazel/issues/3863
Change-Id: Ib48b405cf93eafd48e21b280bcbab4d45117c1d9
PiperOrigin-RevId: 171291435
Diffstat (limited to 'src/main/native')
| -rw-r--r-- | src/main/native/windows/build_windows_jni.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/native/windows/build_windows_jni.sh b/src/main/native/windows/build_windows_jni.sh index 5d39b8f436..ad52518ea2 100644 --- a/src/main/native/windows/build_windows_jni.sh +++ b/src/main/native/windows/build_windows_jni.sh @@ -99,7 +99,7 @@ cat > "${VSTEMP}/windows_jni.bat" <<EOF @call "${VSVARS}" amd64 @cd $(cygpath -a -w "${PWD}") @set TMP=$(cygpath -a -w "${VSTEMP}") -@CL /O2 /EHsc /LD /Fe:"$(cygpath -a -w ${DLL})" /I "${VSTEMP}" /I . ${WINDOWS_SOURCES[*]} +@CL /O2 /EHsc /LD /Fe:"$(cygpath -a -w ${DLL})" /I "%TMP%" /I . ${WINDOWS_SOURCES[*]} EOF # Invoke the file and hopefully generate the .DLL . |