diff options
Diffstat (limited to 'scripts/flags.sh')
| -rwxr-xr-x | scripts/flags.sh | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/scripts/flags.sh b/scripts/flags.sh index b1de8f3c71..0b1f69ae1c 100755 --- a/scripts/flags.sh +++ b/scripts/flags.sh @@ -2,6 +2,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export DISPLAY=:99.0 + sh -e /etc/init.d/xvfb start # use g++ that supports c++11 @@ -15,17 +16,17 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # but it's not worth a standalone matrix so here # we just test address->gcc and thread->clang for # some limited coverage - if [[ ${BUILDTYPE} == "Debug" ]]; then - if [[ ${CXX} == "g++" ]]; then - export CXXFLAGS="-fsanitize=address -g ${CXXFLAGS}" - export CFLAGS="-fsanitize=address -g ${CFLAGS}" - export LDFLAGS="-fsanitize=address ${LDFLAGS}" - elif [[ ${CXX} == "clang++" ]]; then - export CXXFLAGS="-fsanitize=thread -g -fPIC ${CXXFLAGS}" - export CFLAGS="-fsanitize=thread -g ${CFLAGS}" - export LDFLAGS="-fsanitize=thread -pie ${LDFLAGS}" - fi - fi + # if [[ ${BUILDTYPE} == "Debug" ]]; then + # if [[ ${CXX} == "g++" ]]; then + # export CXXFLAGS="-fsanitize=address -g ${CXXFLAGS}" + # export CFLAGS="-fsanitize=address -g ${CFLAGS}" + # export LDFLAGS="-fsanitize=address ${LDFLAGS}" + # elif [[ ${CXX} == "clang++" ]]; then + # export CXXFLAGS="-fsanitize=thread -g -fPIC ${CXXFLAGS}" + # export CFLAGS="-fsanitize=thread -g ${CFLAGS}" + # export LDFLAGS="-fsanitize=thread -pie ${LDFLAGS}" + # fi + # fi fi # turn off a few warnings |