| author |  Andrew Kelley <andrew@ziglang.org> 2018-09-11 20:54:55-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2018-09-11 20:54:55-04:00 |
| log | 25466ffb71d653e3353bf6d86ef55bc2a4da1d59 |
| tree | 196f88f8e137a26e620439140ccfcb898a65c408 |
| parent | 7e9f25dd18b7da750e547de94a779e3c14c07d94 |
| parent | 6b7f3d01ae3ea2c6535b72339f1023ab426c40fd |
| signature |  Commit is signed but in an unrecognized format. |
Merge remote-tracking branch 'origin/master' into stage1-caching
2 files changed, 2 insertions(+), 2 deletions(-)
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) | 11 | cmake .. -DCMAKE_BUILD_TYPE=Release |
| 12 | make -j2 install | 12 | make -j2 install |
| 13 | ./zig build --build-file ../build.zig test | 13 | ./zig build --build-file ../build.zig test |
| 14 | 14 |
ci/travis_osx_script+1-1
| ... | @@ -5,7 +5,7 @@ set -e | ... | @@ -5,7 +5,7 @@ set -e |
| 5 | 5 | ||
| 6 | mkdir build | 6 | mkdir build |
| 7 | cd build | 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 | make VERBOSE=1 | 9 | make VERBOSE=1 |
| 10 | make install | 10 | make install |
| 11 | 11 |