From 335a363ac44d789ca3fa0e58893a6b9f0cccd3ed Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Sun, 9 Mar 2014 23:18:05 +0000
Subject: [PATCH] Travis: apply ASan/TSan flags to ZNC, not SWIG

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2d79606..2cb82415 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,13 @@ compiler:
     - gcc
     - clang
 env:
-    - CFGFLAGS= CXXFLAGS= LDFLAGS=
+    - CFGFLAGS= MYCXXFLAGS= MYLDFLAGS=
 matrix:
     include:
         - compiler: clang
-          env: CFGFLAGS=--enable-debug CXXFLAGS="-fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls" LDFLAGS=-fsanitize=address
+          env: CFGFLAGS=--enable-debug MYCXXFLAGS="-fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls" MYLDFLAGS=-fsanitize=address
         - compiler: clang
-          env: CFGFLAGS=--enable-debug CXXFLAGS="-fsanitize=thread -O1" LDFLAGS=-fsanitize=thread
+          env: CFGFLAGS=--enable-debug MYCXXFLAGS="-fsanitize=thread -O1" MYLDFLAGS=-fsanitize=thread
 before_install:
     - sudo apt-get update -qq
     - sudo apt-get install -qq libperl-dev python3-dev tcl-dev libsasl2-dev libgtest-dev libicu-dev
@@ -19,7 +19,7 @@ script:
     - ./bootstrap.sh
     - mkdir build
     - cd build
-    - ../configure --enable-perl --enable-python --enable-tcl --enable-cyrus --with-gtest=/usr/src/gtest $CFGFLAGS
+    - ../configure --enable-perl --enable-python --enable-tcl --enable-cyrus --with-gtest=/usr/src/gtest $CFGFLAGS CXXFLAGS="$CXXFLAGS $MYCXXFLAGS" LDFLAGS="$LDFLAGS $MYLDFLAGS"
     - cat config.log
     - make V=1
     - make V=1 test