fix a couple of travis build failures
This commit is contained in:
parent
46c9a8de8b
commit
e04dfb2b27
@ -27,7 +27,7 @@ if [ "x$ARCH" = "xnative" ]; then
|
|||||||
else
|
else
|
||||||
sudo apt-add-repository -y ppa:kalakris/cmake
|
sudo apt-add-repository -y ppa:kalakris/cmake
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y $ARCH-x-gcc cmake ninja-build
|
sudo apt-get install -y cmake ninja-build
|
||||||
cmake .. -GNinja
|
cmake .. -GNinja
|
||||||
ninja
|
ninja
|
||||||
fi
|
fi
|
||||||
@ -38,7 +38,7 @@ else
|
|||||||
fi
|
fi
|
||||||
export CC=$CPU-w64-mingw32-gcc
|
export CC=$CPU-w64-mingw32-gcc
|
||||||
|
|
||||||
if ! hash $CC 2>/dev/null; then
|
if hash $CC 2>/dev/null; then
|
||||||
# Update Ubuntu 12.04 with current mingw toolchain
|
# Update Ubuntu 12.04 with current mingw toolchain
|
||||||
sudo apt-add-repository -y ppa:tobydox/mingw-x-precise
|
sudo apt-add-repository -y ppa:tobydox/mingw-x-precise
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
|
Loading…
x
Reference in New Issue
Block a user