diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-05-30 13:44:25 -0700 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-05-30 13:44:25 -0700 |
| commit | b24dc07fdddb13de9b984ce89a9d433fa431697a (patch) | |
| tree | 695a706daec1febffb1fc33050d18d992d415eaa /.travis.yml | |
| parent | 5f03cc15955479809571e166e3418d8c1ee56023 (diff) | |
| download | qtlocation-mapboxgl-b24dc07fdddb13de9b984ce89a9d433fa431697a.tar.gz | |
[travis] build with libc++ when building with clang++ - refs #287
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 1c72c857d0..6a2b65fdd8 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 |