diff --git a/.travis.yml b/.travis.yml index 8c03b0d..fe517ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,8 @@ script: env: - BRBASE=3.16 - BRBASE=3.16 CMPLR=clang - - BRBASE=3.16 USR_CXXFLAGS=-std=c++11 - - BRBASE=3.16 USR_CXXFLAGS=-std=c++11 CMPLR=clang + - BRBASE=3.16 EXTRA="CMD_CXXFLAGS=-std=c++11" + - BRBASE=3.16 EXTRA="CMD_CXXFLAGS=-std=c++11" CMPLR=clang - BRBASE=3.16 WINE=32 TEST=NO STATIC=YES - BRBASE=3.16 WINE=32 TEST=NO STATIC=NO - BRBASE=3.15 diff --git a/ci/travis-build.sh b/ci/travis-build.sh index 36c49cf..a022471 100755 --- a/ci/travis-build.sh +++ b/ci/travis-build.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -x -make -j2 +make -j2 $EXTRA if [ "$TEST" != "NO" ] then diff --git a/ci/travis-prepare.sh b/ci/travis-prepare.sh index 787d55d..a427d71 100755 --- a/ci/travis-prepare.sh +++ b/ci/travis-prepare.sh @@ -62,4 +62,4 @@ USR_CFLAGS += $USR_CFLAGS USR_CXXFLAGS += $USR_CXXFLAGS EOF -make -j2 -C epics-base +make -j2 -C epics-base $EXTRA