travis-ci fix c++11 builds

This commit is contained in:
Michael Davidsaver
2017-09-13 09:17:56 -05:00
parent c7c83282ee
commit fd0570f0c9
3 changed files with 4 additions and 4 deletions

View File

@@ -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

View File

@@ -1,7 +1,7 @@
#!/bin/sh
set -e -x
make -j2
make -j2 $EXTRA
if [ "$TEST" != "NO" ]
then

View File

@@ -62,4 +62,4 @@ USR_CFLAGS += $USR_CFLAGS
USR_CXXFLAGS += $USR_CXXFLAGS
EOF
make -j2 -C epics-base
make -j2 -C epics-base $EXTRA