Merge remote-tracking branch 'origin/master' into stage1-caching
2 files changed, 2 insertions(+), 2 deletions(-)
ci
ci/travis_linux_script+1-1
| ... | ... | @@ -8,7 +8,7 @@ export CXX=clang++-6.0 |
| 8 | 8 | echo $PATH |
| 9 | 9 | mkdir build |
| 10 | 10 | cd build |
| 11 | | cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) |
| 11 | cmake .. -DCMAKE_BUILD_TYPE=Release |
| 12 | 12 | make -j2 install |
| 13 | 13 | ./zig build --build-file ../build.zig test |
| 14 | 14 | |
ci/travis_osx_script+1-1
| ... | ... | @@ -5,7 +5,7 @@ set -e |
| 5 | 5 | |
| 6 | 6 | mkdir build |
| 7 | 7 | cd build |
| 8 | | cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_INSTALL_PREFIX=$(pwd) |
| 8 | cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_BUILD_TYPE=Release |
| 9 | 9 | make VERBOSE=1 |
| 10 | 10 | make install |
| 11 | 11 | |
Andrew Kelley <andrew@ziglang.org> 2018-09-11 20:54:55-04:00
Commit is signed but in an unrecognized format.