| author |  Andrew Kelley <andrew@ziglang.org> 2018-03-30 17:24:56-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2018-03-30 17:26:01-04:00 |
| log | 5d5feb11deb797bbecb8f3676457a74056f09496 |
| tree | b5d6c47a9eb5af4e0a8b6e2794f74dca985deccf |
| parent | b01c50d6fae581050affdc438942b979ae54a8da |
appveyor and travis ci: stop passing unused configure args
2 files changed, 2 insertions(+), 4 deletions(-)
ci
ci/appveyor/build_script.bat+1-3
| ... | @@ -20,9 +20,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_ | ... | @@ -20,9 +20,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_ |
| 20 | 20 | ||
| 21 | mkdir %ZIGBUILDDIR% | 21 | mkdir %ZIGBUILDDIR% |
| 22 | cd %ZIGBUILDDIR% | 22 | cd %ZIGBUILDDIR% |
| 23 | cmake.exe .. -Thost=x64 -G"Visual Studio 14 2015 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGBUILDDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release "-DZIG_LIBC_INCLUDE_DIR=C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt" "-DZIG_LIBC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\bin\x64\ucrt" "-DZIG_LIBC_STATIC_LIB_DIR=C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64" || exit /b | 23 | cmake.exe .. -Thost=x64 -G"Visual Studio 14 2015 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGBUILDDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b |
| 24 | msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b | 24 | msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b |
| 25 | 25 | ||
| 26 | bin\zig.exe build --build-file ..\build.zig test || exit /b | 26 | bin\zig.exe build --build-file ..\build.zig test || exit /b |
| 27 | |||
| 28 | @echo "MSVC build succeeded" |
ci/travis_linux_script+1-1
| ... | @@ -8,7 +8,7 @@ export CXX=clang++-6.0 | ... | @@ -8,7 +8,7 @@ export CXX=clang++-6.0 |
| 8 | echo $PATH | 8 | echo $PATH |
| 9 | mkdir build | 9 | mkdir build |
| 10 | cd build | 10 | cd build |
| 11 | cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) | 11 | cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) |
| 12 | make VERBOSE=1 | 12 | make VERBOSE=1 |
| 13 | make install | 13 | make install |
| 14 | ./zig build --build-file ../build.zig test | 14 | ./zig build --build-file ../build.zig test |