Pass correct LDFLAGS in .travis.sh and the travis target

The change in 48b34a49469a11abae79ce24ebe1c12b5711fbe0 was not fully
propagated to .travis.sh.

diff --git a/.travis.sh b/.travis.sh
index 8c483ad3d489f75a41b907686f02997d35ad2fb5..35a75b52133b2cc03f7345ff764cc24eb1cd5910 100755 (executable)
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,9 +1,10 @@
 #!/bin/sh -ex
+
 make clean
 make travis CC=gcc
 make travis CC=clang
-make travis CC=gcc CFLAGS="-m32 -g -O2" HOST="--host=i386-linux-gnu"
+make travis CC=gcc CFLAGS="-m32 -g -O2" LDFLAGS="-m32" 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" 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=clang CFLAGS="-fsanitize=address -g" LDFLAGS="-fsanitize=address" ASAN_OPTIONS="detect_leaks=0"
 make travis CC=/usr/bin/clang TEST=analyze

diff --git a/dev.mk.in b/dev.mk.in
index 75e8511ec7fe81d8c6a6ea015f366c3e9beac53c..8daf1c1fa361b0af6e6944c6870b217b17b49e8c 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -243,6 +243,6 @@ docker: buildenv/$(BUILDENV)/Dockerfile
 travis: .travis/Dockerfile
        $(DOCKER) inspect travis-build >/dev/null || $(DOCKER) build -t travis-build .travis
        $(DOCKER) run --rm --volume $(PWD):/src --tmpfs /dst:rw,exec --env ASAN_OPTIONS='$(ASAN_OPTIONS)' travis-build \
-       sh -c "cd /src && ./autogen.sh && cd /dst && CC=$(CC) CFLAGS='$(CFLAGS)' /src/configure $(HOST) && make && make $(TEST)"
+       sh -c "cd /src && ./autogen.sh && cd /dst && CC=$(CC) CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' /src/configure $(HOST) && make V=$(V) && make V=$(V) $(TEST)"
 
 -include .deps/*.d