Pass AM_CFLAGS to the compiler when extracting the default linker

script so we are sure to get the 32 bit version when appropriate.

Also pass ARCH_CORE_AM_CFLAGS in EXTRA_CFLAGS when building VEX so
we can be sure to build a 32 bit VEX when appropriate.

This should fix bug #110830.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4442

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 7a66a38bbc10b4671bc2b85e0ab1fb27bd0346d3..47a37ba1af2253e76691218780c707739c696acb 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -191,14 +191,14 @@ vg_preload_core_so_LDFLAGS = \
 # So we search for the line with a hex value "+ SIZEOF_HEADERS", and replace
 # all the hex values in that line with "kickstart_base".
 stage2.lds: Makefile
-       $(CC) -Wl,--verbose -nostdlib 2>&1 | sed \
+       $(CC) $(AM_CFLAGS) -Wl,--verbose -nostdlib 2>&1 | sed \
                -e '1,/^=====\+$$/d' \
                -e '/^=====\+$$/d' \
                -e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/kickstart_base/g' > $@ \
        || rm -f $@
 
 @VEX_DIR@/libvex.a: @VEX_DIR@/priv/main/vex_svnversion.h
-       $(MAKE) -C @VEX_DIR@ libvex.a EXTRA_CFLAGS="@PIE_AM_CFLAGS@"
+       $(MAKE) -C @VEX_DIR@ libvex.a EXTRA_CFLAGS="@ARCH_CORE_AM_CFLAGS@ @PIE_AM_CFLAGS@"
 
 @VEX_DIR@/priv/main/vex_svnversion.h:
        $(MAKE) -C @VEX_DIR@ version