commit 25466ffb71d653e3353bf6d86ef55bc2a4da1d59 (tree) parent 7e9f25dd18b7da750e547de94a779e3c14c07d94 Author: Andrew Kelley <superjoe30@gmail.com> Date: Tue, 11 Sep 2018 20:54:55 -0400 Merge remote-tracking branch 'origin/master' into stage1-caching Diffstat:
| M | ci/travis_linux_script | | | 2 | +- |
| M | ci/travis_osx_script | | | 2 | +- |
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/travis_linux_script b/ci/travis_linux_script @@ -8,7 +8,7 @@ export CXX=clang++-6.0 echo $PATH mkdir build cd build -cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) +cmake .. -DCMAKE_BUILD_TYPE=Release make -j2 install ./zig build --build-file ../build.zig test diff --git a/ci/travis_osx_script b/ci/travis_osx_script @@ -5,7 +5,7 @@ set -e mkdir build cd build -cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_INSTALL_PREFIX=$(pwd) +cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_BUILD_TYPE=Release make VERBOSE=1 make install