build: set arch specific -m switches in tests-m*32/Makefile.am files properly

* tests/Makefile.am (ARCH_MFLAGS, AM_LDFLAGS): New variables.
(AM_CPPFLAGS): Use ARCH_MFLAGS.
* bootstrap: In tests-m32/Makefile.am and tests-mx32/Makefile.am,
add -m32 and -mx32, respectively, to ARCH_MFLAGS instead of AM_CFLAGS.

diff --git a/bootstrap b/bootstrap
index cb9026094a28d5a8822d6d9d823763697348634d..1044ce2277b32f11aeeee3dc35516e3ca7a62b60 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ for m in m32 mx32; do
        tests=tests-$m
        rm -rf $tests
        mkdir $tests
-       sed "s/@arch@/@arch_$m@/;s/^AM_CFLAGS[[:space:]]*=.*/& -$m/" \
+       sed "s/@arch@/@arch_$m@/;s/^ARCH_MFLAGS[[:space:]]*=.*/& -$m/" \
                tests/Makefile.am > $tests/Makefile.am
        for f in tests/*; do
                case "${f##*/}" in

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 71c8130e681bb06d557614ffcc79546918d1a186..f0deb600383152250ba3be3e2c610dfe1652bb84 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,13 +2,16 @@
 
 OS = linux
 ARCH = @arch@
+ARCH_MFLAGS =
 AM_CFLAGS = $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(top_builddir)/$(OS)/$(ARCH) \
+AM_CPPFLAGS = $(ARCH_MFLAGS) \
+             -I$(top_builddir)/$(OS)/$(ARCH) \
              -I$(top_srcdir)/$(OS)/$(ARCH) \
              -I$(top_builddir)/$(OS) \
              -I$(top_srcdir)/$(OS) \
              -I$(top_builddir) \
              -I$(top_srcdir)
+AM_LDFLAGS = $(ARCH_MFLAGS)
 
 check_PROGRAMS = \
        adjtimex \