diff options
author | Brent Cook <bcook@openbsd.org> | 2015-01-31 22:35:52 -0600 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-01-31 22:35:52 -0600 |
commit | fc7ba469065c5fa307f4cb96746290ff5d050d2e (patch) | |
tree | fdb2bdc9c4ba4a543ca59b764a69184e8555e1b5 /scripts | |
parent | 100625e317a1fb4cdb2052a8a6d3657097ee109a (diff) | |
download | portable-fc7ba469065c5fa307f4cb96746290ff5d050d2e.tar.gz portable-fc7ba469065c5fa307f4cb96746290ff5d050d2e.tar.bz2 portable-fc7ba469065c5fa307f4cb96746290ff5d050d2e.zip |
be nicer to travis OS X machines, remove unneeded 'make clean'
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/travis | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/scripts/travis b/scripts/travis index e5497c6..831c81c 100755 --- a/scripts/travis +++ b/scripts/travis | |||
@@ -4,15 +4,20 @@ set -e | |||
4 | ./autogen.sh | 4 | ./autogen.sh |
5 | 5 | ||
6 | if [ "x$ARCH" = "xnative" ]; then | 6 | if [ "x$ARCH" = "xnative" ]; then |
7 | ./configure --enable-libtls | 7 | ./configure --enable-libtls |
8 | make clean | 8 | if [ `uname` = "Darwin" ]; then |
9 | make -j distcheck | 9 | # OS X runs out of resources if we run 'make -j check' |
10 | make -j | ||
11 | make check | ||
12 | else | ||
13 | make -j distcheck | ||
14 | fi | ||
10 | else | 15 | else |
11 | CPU=i686 | 16 | CPU=i686 |
12 | if [ "x$ARCH" = "xmingw64" ]; then | 17 | if [ "x$ARCH" = "xmingw64" ]; then |
13 | CPU=x86_64 | 18 | CPU=x86_64 |
14 | fi | 19 | fi |
15 | export CC=$CPU-w64-mingw32-gcc | 20 | export CC=$CPU-w64-mingw32-gcc |
16 | 21 | ||
17 | if [ -z $(which $CC) ]; then | 22 | if [ -z $(which $CC) ]; then |
18 | # Update Ubuntu 12.04 with current mingw toolchain | 23 | # Update Ubuntu 12.04 with current mingw toolchain |
@@ -24,7 +29,6 @@ else | |||
24 | export PATH=$PATH:/opt/$ARCH/bin | 29 | export PATH=$PATH:/opt/$ARCH/bin |
25 | fi | 30 | fi |
26 | 31 | ||
27 | ./configure --host=$CPU-w64-mingw32 --enable-libtls | 32 | ./configure --host=$CPU-w64-mingw32 --enable-libtls |
28 | make clean | 33 | make -j |
29 | make -j | ||
30 | fi | 34 | fi |