diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-09-09 07:34:37 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-09-09 07:34:37 -0500 |
| commit | e04dfb2b272b503379857d641772613e2f37a1a8 (patch) | |
| tree | 244ed076b071c6c77bf1a4fb9ef031868285f9e4 /scripts | |
| parent | 46c9a8de8ba8f42aae2f13f7641ffbfd00a32d99 (diff) | |
| download | portable-e04dfb2b272b503379857d641772613e2f37a1a8.tar.gz portable-e04dfb2b272b503379857d641772613e2f37a1a8.tar.bz2 portable-e04dfb2b272b503379857d641772613e2f37a1a8.zip | |
fix a couple of travis build failures
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/travis b/scripts/travis index 95f9902..3253538 100755 --- a/scripts/travis +++ b/scripts/travis | |||
| @@ -27,7 +27,7 @@ if [ "x$ARCH" = "xnative" ]; then | |||
| 27 | else | 27 | else |
| 28 | sudo apt-add-repository -y ppa:kalakris/cmake | 28 | sudo apt-add-repository -y ppa:kalakris/cmake |
| 29 | sudo apt-get update | 29 | sudo apt-get update |
| 30 | sudo apt-get install -y $ARCH-x-gcc cmake ninja-build | 30 | sudo apt-get install -y cmake ninja-build |
| 31 | cmake .. -GNinja | 31 | cmake .. -GNinja |
| 32 | ninja | 32 | ninja |
| 33 | fi | 33 | fi |
| @@ -38,7 +38,7 @@ else | |||
| 38 | fi | 38 | fi |
| 39 | export CC=$CPU-w64-mingw32-gcc | 39 | export CC=$CPU-w64-mingw32-gcc |
| 40 | 40 | ||
| 41 | if ! hash $CC 2>/dev/null; then | 41 | if hash $CC 2>/dev/null; then |
| 42 | # Update Ubuntu 12.04 with current mingw toolchain | 42 | # Update Ubuntu 12.04 with current mingw toolchain |
| 43 | sudo apt-add-repository -y ppa:tobydox/mingw-x-precise | 43 | sudo apt-add-repository -y ppa:tobydox/mingw-x-precise |
| 44 | sudo apt-get update | 44 | sudo apt-get update |