From b24dc07fdddb13de9b984ce89a9d433fa431697a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 30 May 2014 13:44:25 -0700 Subject: [PATCH] [travis] build with libc++ when building with clang++ - refs #287 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1c72c857d..6a2b65fdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_script: - if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "g++" ]]; then export CXXFLAGS="-fsanitize=address";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=address" ; fi - if [[ ${BUILDTYPE} == "Debug" ]] && [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-fsanitize=thread -fPIC";export CFLAGS="${CXXFLAGS}";export LDFLAGS="-fsanitize=thread -pie" ; fi -- if [[ ${CXX} == "clang++" ]]; then export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas $CXXFLAGS"; fi +- if [[ ${CXX} == "clang++" ]]; then sudo apt-get install -y libc++1 libc++-dev; export LDFLAGS="-stdlib=libc++ ${LDFLAGS}"; export CXXFLAGS="-stdlib=libc++ -Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}"; fi script: - make llmr BUILDTYPE=${BUILDTYPE} - make clean