summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Erik Rediger <janerik@fnordig.de>2015-04-29 14:37:29 +0200
committerJan-Erik Rediger <janerik@fnordig.de>2015-05-03 22:33:39 +0200
commit26999505d6c73566dd382e0730909732c37f71cf (patch)
tree97eca9d3b117ef5ddd6b04ecfef69cb49786e93c
parent8999750f12ba61f7ec550c38c5eada235f6bc06b (diff)
Make sure to compile example to trigger edge-cases in compiling
-rw-r--r--.travis.yml6
-rw-r--r--Makefile4
2 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 6db9930..1df63b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,11 @@ compiler:
env:
- CFLAGS="-Werror"
- PRE="valgrind --track-origins=yes --leak-check=full"
- - TARGET="32bit" CFLAGS="-Werror"
- - TARGET="32bit" PRE="valgrind --track-origins=yes --leak-check=full"
+ - TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
+ - TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
install:
- sudo apt-get update -qq
- sudo apt-get install libc6-dbg libc6-dev libc6-i686:i386 libc6-dev-i386 libc6-dbg:i386 valgrind -y
-script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE"
+script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example
diff --git a/Makefile b/Makefile
index beb7e2b..8b0f0c2 100644
--- a/Makefile
+++ b/Makefile
@@ -176,6 +176,10 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
@echo ""
$(MAKE) CFLAGS="-m32" LDFLAGS="-m32"
+32bit-vars:
+ $(eval CFLAGS=-m32)
+ $(eval LDFLAGS=-m32)
+
gprof:
$(MAKE) CFLAGS="-pg" LDFLAGS="-pg"