Don’t pass CFLAGS to the linker

diff --git a/.travis.sh b/.travis.sh
index ad646783857250e92e15fbd714096650ec593792..8c483ad3d489f75a41b907686f02997d35ad2fb5 100755 (executable)
--- a/.travis.sh
+++ b/.travis.sh
@@ -4,6 +4,6 @@ make travis CC=gcc
 make travis CC=clang
 make travis CC=gcc CFLAGS="-m32 -g -O2" HOST="--host=i386-linux-gnu"
 make travis CC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" TEST="unittest/run.exe"
-make travis CC=clang CFLAGS="-fsanitize=undefined" ASAN_OPTIONS="detect_leaks=0"
-make travis CC=clang CFLAGS="-fsanitize=address -g" ASAN_OPTIONS="detect_leaks=0"
+make travis CC=clang CFLAGS="-fsanitize=undefined" LDFLAGS="-fsanitize=undefined" ASAN_OPTIONS="detect_leaks=0"
+make travis CC=clang CFLAGS="-fsanitize=address -g" LDFLAGS="-fsanitize=undefined" ASAN_OPTIONS="detect_leaks=0"
 make travis CC=/usr/bin/clang TEST=analyze

diff --git a/.travis.yml b/.travis.yml
index 582e607df3a64befbc6486889026a28e3b97a23c..c9245b346cb96cf176c4bdd5379a48b11b973309 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
     include:
         - os: linux
           compiler: gcc
-          env: CFLAGS="-m32 -g -O2" HOST="--host=i386-linux-gnu"
+          env: CFLAGS="-m32 -g -O2" LDFLAGS="-m32" HOST="--host=i386-linux-gnu"
           addons:
               apt:
                   packages:
@@ -34,10 +34,10 @@ matrix:
                       - gcc-mingw-w64-i686
         - os: linux
           compiler: clang
-          env: CFLAGS="-fsanitize=undefined" ASAN_OPTIONS="detect_leaks=0"
+          env: CFLAGS="-fsanitize=undefined" LDFLAGS="-fsanitize=undefined" ASAN_OPTIONS="detect_leaks=0"
         - os: linux
           compiler: clang
-          env: CFLAGS="-fsanitize=address -g" ASAN_OPTIONS="detect_leaks=0"
+          env: CFLAGS="-fsanitize=address -g" LDFLAGS="-fsanitize=address" ASAN_OPTIONS="detect_leaks=0"
         - os: linux
           compiler: clang
           env: PATH="/usr/bin:$PATH" TEST=analyze

diff --git a/Makefile.in b/Makefile.in
index 2f41cb75d54741b037b658bbd8dbb9a5e963eec7..ee280b450c9697b9ee3c1170fd5e828f85efdf63 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,7 +101,7 @@ all: ccache$(EXEEXT)
 
 ccache$(EXEEXT): $(ccache_objs) $(extra_libs)
        $(if $(quiet),@echo "  LD       $@")
-       $(Q)$(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
+       $(Q)$(CC) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
 
 ccache.1: doc/ccache.1
        $(if $(quiet),@echo "  CP       $@")
@@ -150,7 +150,7 @@ unittest: unittest/run$(EXEEXT)
 
 unittest/run$(EXEEXT): $(base_objs) $(test_objs) $(extra_libs)
        $(if $(quiet),@echo "  LD       $@")
-       $(Q)$(CC) $(all_cflags) -o $@ $(base_objs) $(test_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
+       $(Q)$(CC) -o $@ $(base_objs) $(test_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
 
 unittest/main.o: unittest/suites.h