Fix makefile: 32 bit builds without optimization.

Fixes failing build for

make ARCH=x86-32 clean && make ARCH=x86-32 optimize=no build

by passing -m32 also to the link step.

Extend travis testing accordingly.

No functional change.

Closes #999

diff --git a/.travis.yml b/.travis.yml
index 87a3e7dc7437f095d30cddd265080cf2c61ceed9..4310b1bd40387ea064e70919e0e1d15a6dbb8228 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,6 +54,8 @@ script:
   # verify against reference
   - make clean && make ARCH=x86-64 build > /dev/null && ../tests/signature.sh $benchref
   - make clean && make ARCH=x86-32 build > /dev/null && ../tests/signature.sh $benchref
+  - make clean && make ARCH=x86-64 optimize=no debug=yes build > /dev/null && ../tests/signature.sh $benchref
+  - make clean && make ARCH=x86-32 optimize=no debug=yes build > /dev/null && ../tests/signature.sh $benchref
   #
   # perft
   #

diff --git a/src/Makefile b/src/Makefile
index 47b884a009776eaa7c1f8e65f85f5455d76340fc..33b6d159a9b70c539d77c058a519aa242381cbe6 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -155,9 +155,11 @@ ifeq ($(COMP),gcc)
        ifeq ($(ARCH),armv7)
                ifeq ($(OS),Android)
                        CXXFLAGS += -m$(bits)
+                       LDFLAGS += -m$(bits)
                endif
        else
                CXXFLAGS += -m$(bits)
+               LDFLAGS += -m$(bits)
        endif
 
        ifneq ($(KERNEL),Darwin)