From 7c589b9da49631667c4847ffe29fca37970a327a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 29 May 2014 16:54:36 -0700 Subject: sanitizer needs CFLAGS set for libtess --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.travis.yml') 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} -- cgit v1.2.1