Permalink
Browse files

* Updating using_clang.mpb to allow for setting the clang suffix with…

… CLANG_SUFFIX or using the default of -5.0

* Updating travis.yml to run more tests
  • Loading branch information...
jredmondson committed Jun 13, 2018
1 parent d24ee29 commit b3b5213d7c4b31b49a921743820bc17f713806ce
Showing with 45 additions and 18 deletions.
  1. +37 −16 .travis.yml
  2. +8 −2 using_clang.mpb
@@ -18,22 +18,31 @@ env:
matrix:
include:
################MAC#####################
# clang, osx, no ssl
- compiler: clang
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-5.0
packages:
- libssl-dev
- clang-5.0
env: TESTNAME="OSX Clang" CLANG="clang"
env: NAME="OSX 10.13 clang" CLANG="clang"
os: osx
osx_image: xcode9.3
# clang, osx, ssl
- compiler: clang
env: NAME="OSX 10.13 clang ssl" CLANG="clang" SSL="ssl"
os: osx
osx_image: xcode9.3
# clang, osx, java
- compiler: clang
env: NAME="OSX 10.13 clang java" CLANG="clang" JAVA="java"
os: osx
osx_image: xcode9.3
################LINUX#####################
# clang, linux, no ssl
- compiler: clang
env: TESTNAME="Ubuntu 14.04 clang" CLANG="clang"
env: NAME="Ubuntu 14.04 clang" CLANG="clang"
addons:
apt:
sources:
@@ -47,7 +56,7 @@ matrix:
# g++, linux, no ssl
- compiler: gcc
os: linux
env: TESTNAME="Ubuntu 14.04 g++" CLANG=""
env: NAME="Ubuntu 14.04 g++" CLANG=""
# g++, linux, ssl
- compiler: gcc
@@ -58,7 +67,7 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- libssl-dev
env: TESTNAME="Ubuntu 14.04 g++ ssl" CLANG="" SSL="ssl"
env: NAME="Ubuntu 14.04 g++ ssl" CLANG="" SSL="ssl"
# g++, linux, java
- compiler: gcc
@@ -69,7 +78,19 @@ matrix:
- ubuntu-toolchain-r-test
packages:
- libssl-dev
env: TESTNAME="Ubuntu 14.04 g++ java" JAVA="java"
env: NAME="Ubuntu 14.04 g++ java" JAVA="java"
# g++, linux, zmq
- compiler: gcc
os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libssl-dev
env: NAME="Ubuntu 14.04 g++ zmq" ZMQ="zmq"
addons:
apt:
@@ -88,10 +109,10 @@ branches:
before_script:
- export
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export OS=linux; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OS=mac; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OS=mac; export CLANG_SUFFIX=; fi
script:
- echo $GAMS_ROOT/scripts/$OS/base_build.sh prereqs $CLANG madara gams tests $SSL $JAVA
- $GAMS_ROOT/scripts/$OS/base_build.sh prereqs $CLANG madara gams tests $SSL $JAVA
- echo $GAMS_ROOT/scripts/$OS/base_build.sh prereqs $CLANG madara gams tests $SSL $JAVA $ZMQ
- $GAMS_ROOT/scripts/$OS/base_build.sh prereqs $CLANG madara gams tests $SSL $JAVA $ZMQ
@@ -1,11 +1,17 @@
feature (clang) {
expand(CLANG_SUFFIX) {
$CLANG_SUFFIX
-5.0
}
specific (prop:make) {
includes += /usr/include/libcxxabi
CXX = clang++$(CLANG_SUFFIX)
CC = clang$(CLANG_SUFFIX)
}
verbatim (make, local, true) {
CXX = clang++-5.0
CC = clang-5.0
CPPFLAGS := -stdlib=libc++ $(CPPFLAGS)
}
}

0 comments on commit b3b5213

Please sign in to comment.