aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-09-09 07:13:05 -0500
committerBrent Cook <bcook@openbsd.org>2015-09-09 07:13:05 -0500
commit46c9a8de8ba8f42aae2f13f7641ffbfd00a32d99 (patch)
tree086bb04d3b5d0700bc6bd16090e38e7c720f9511
parent9e090286b55def5ca2c0cc375c65023a70d8796e (diff)
downloadportable-46c9a8de8ba8f42aae2f13f7641ffbfd00a32d99.tar.gz
portable-46c9a8de8ba8f42aae2f13f7641ffbfd00a32d99.tar.bz2
portable-46c9a8de8ba8f42aae2f13f7641ffbfd00a32d99.zip
revert some travis shell portability tweaks
-rwxr-xr-xscripts/travis8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/travis b/scripts/travis
index e54f1f0..95f9902 100755
--- a/scripts/travis
+++ b/scripts/travis
@@ -3,10 +3,10 @@ set -e
3 3
4./autogen.sh 4./autogen.sh
5 5
6if "x$ARCH" = "xnative"; then 6if [ "x$ARCH" = "xnative" ]; then
7 # test autotools 7 # test autotools
8 ./configure 8 ./configure
9 if `uname` = "Darwin"; then 9 if [ `uname` = "Darwin" ]; then
10 # OS X runs out of resources if we run 'make -j check' 10 # OS X runs out of resources if we run 'make -j check'
11 make check 11 make check
12 else 12 else
@@ -21,7 +21,7 @@ if "x$ARCH" = "xnative"; then
21 cd build 21 cd build
22 22
23 # test cmake and ninja 23 # test cmake and ninja
24 if `uname` = "Darwin"; then 24 if [ `uname` = "Darwin" ]; then
25 cmake .. 25 cmake ..
26 make 26 make
27 else 27 else
@@ -33,7 +33,7 @@ if "x$ARCH" = "xnative"; then
33 fi 33 fi
34else 34else
35 CPU=i686 35 CPU=i686
36 if "x$ARCH" = "xmingw64"; then 36 if [ "x$ARCH" = "xmingw64" ]; then
37 CPU=x86_64 37 CPU=x86_64
38 fi 38 fi
39 export CC=$CPU-w64-mingw32-gcc 39 export CC=$CPU-w64-mingw32-gcc