travis-ci fix c++11 builds
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
set -e -x
|
||||
|
||||
make -j2
|
||||
make -j2 $EXTRA
|
||||
|
||||
if [ "$TEST" != "NO" ]
|
||||
then
|
||||
|
||||
@@ -62,4 +62,4 @@ USR_CFLAGS += $USR_CFLAGS
|
||||
USR_CXXFLAGS += $USR_CXXFLAGS
|
||||
EOF
|
||||
|
||||
make -j2 -C epics-base
|
||||
make -j2 -C epics-base $EXTRA
|
||||
|
||||
Reference in New Issue
Block a user