summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2014-05-29 16:54:36 -0700
committerDane Springmeyer <dane@mapbox.com>2014-05-29 16:54:36 -0700
commit7c589b9da49631667c4847ffe29fca37970a327a (patch)
tree02c8a185a97da8ebc3f31337e61313fc68e57310
parentbe01b4285404c47691576c93eebc4c6dc619c709 (diff)
downloadqtlocation-mapboxgl-7c589b9da49631667c4847ffe29fca37970a327a.tar.gz
sanitizer needs CFLAGS set for libtess
-rw-r--r--.travis.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 00b80fe5e7..a464bf2030 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,8 @@ install:
before_script:
- if [[ ${CXX} == "g++" ]]; then export CXX="g++-4.8" ; fi
-- if [[ ${BUILDTYPE} == "Debug" ]]; then export CXXFLAGS="-fsanitize=address";export LDFLAGS="-fsanitize=address" ; 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
script:
- make llmr BUILDTYPE=${BUILDTYPE}