From c357a17f847e95cd7a2c52ac1b64e8de6bb962d6 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 2 Jun 2014 15:59:16 -0700 Subject: [PATCH] [travis] don't double build libllmr.a - refs #298 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39a02d05b..b407cec83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,14 +25,13 @@ install: - make setup - rm -rf mapnik-packaging/out/packages - 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 LDFLAGS="${LDFLAGS}"; export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}"; fi + script: -- make llmr BUILDTYPE=${BUILDTYPE} - make linux BUILDTYPE=${BUILDTYPE} - make run-tests BUILDTYPE=${BUILDTYPE} # TODO - port to linux