- Enable clang builds for Travis CI
- build-mg.sh: Switch to clang build if CC and CXX env vars both contain 'clang'
This commit is contained in:
parent
2a3ff97813
commit
09fb20182a
|
@ -1,9 +1,10 @@
|
||||||
language: cpp
|
language: cpp
|
||||||
compiler:
|
compiler:
|
||||||
- gcc
|
- gcc
|
||||||
# - clang
|
- clang
|
||||||
before_install:
|
before_install:
|
||||||
- sudo apt-get update -qq # UPDATE REPOS
|
- sudo apt-get update -qq # UPDATE REPOS
|
||||||
|
- sudo apt-cache policy
|
||||||
- sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL DEPENDENCIES HERE
|
- sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL DEPENDENCIES HERE
|
||||||
script:
|
script:
|
||||||
# ALL THE BUILD COMMANDS HERE
|
# ALL THE BUILD COMMANDS HERE
|
||||||
|
|
17
build-mg.sh
17
build-mg.sh
|
@ -7,6 +7,7 @@
|
||||||
# to enable clang compilation:
|
# to enable clang compilation:
|
||||||
# 1. sudo apt-get install clang
|
# 1. sudo apt-get install clang
|
||||||
# 2. Set the two vars below, WANT_CLANG=YES and CLANG_BIN_PATH=<path to the clang binary>
|
# 2. Set the two vars below, WANT_CLANG=YES and CLANG_BIN_PATH=<path to the clang binary>
|
||||||
|
# OR: set both the CC and CXX environment variables to point to clang and clang++ respectively
|
||||||
WANT_CLANG=NO
|
WANT_CLANG=NO
|
||||||
CLANG_BIN_PATH=/usr/bin/
|
CLANG_BIN_PATH=/usr/bin/
|
||||||
|
|
||||||
|
@ -117,10 +118,24 @@ esac
|
||||||
|
|
||||||
CURRENTDIR="$(dirname $(readlink -f $0))"
|
CURRENTDIR="$(dirname $(readlink -f $0))"
|
||||||
|
|
||||||
if [ "$WANT_CLANG" = 'YES' ]; then
|
if [ "$WANT_CLANG" = 'YES' -o "`echo $CXX | grep -Fq 'clang'`" = 'clang' ]; then
|
||||||
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_C_COMPILER=${CLANG_BIN_PATH}clang -DCMAKE_CXX_COMPILER=${CLANG_BIN_PATH}clang++"
|
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_C_COMPILER=${CLANG_BIN_PATH}clang -DCMAKE_CXX_COMPILER=${CLANG_BIN_PATH}clang++"
|
||||||
echo "USER WANTS to use CLANG / LLVM compiler! EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}"
|
echo "USER WANTS to use CLANG / LLVM compiler! EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}"
|
||||||
#exit 1;
|
#exit 1;
|
||||||
|
elif [ "`echo $CC | grep -Fq 'clang'`" = 'clang' -a "`echo $CXX | grep -Fq 'clang'`" = 'clang' ]; then
|
||||||
|
if [ `echo $CC | grep -Fq '/'` = '/' ]; then
|
||||||
|
CLANG_CC=$CC
|
||||||
|
else
|
||||||
|
CLANG_CC=`which $CC`
|
||||||
|
fi
|
||||||
|
if [ `echo $CXX | grep -Fq '/'` = '/' ]; then
|
||||||
|
CLANG_CXX=$CXX
|
||||||
|
else
|
||||||
|
CLANG_CXX=`which $CXX`
|
||||||
|
fi
|
||||||
|
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_C_COMPILER=${CLANG_CC} -DCMAKE_CXX_COMPILER=${CLANG_CXX}"
|
||||||
|
echo "USER WANTS to use CLANG / LLVM compiler! EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}"
|
||||||
|
#exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Calling cmake with EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}"
|
echo "Calling cmake with EXTRA_CMAKE_OPTIONS = ${EXTRA_CMAKE_OPTIONS}"
|
||||||
|
|
Loading…
Reference in New Issue