Pass $(CC) to the vex Makefile.

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

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 6518a918af884d6abc5f6dbefed0a0bf8146f30d..ffb447f06c7ebdf549b18a311b78fd11e2d225c0 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -202,13 +202,13 @@ stage2.lds: Makefile
        || rm -f $@
 
 @VEX_DIR@/libvex.a: @VEX_DIR@/priv/main/vex_svnversion.h
-       $(MAKE) -C @VEX_DIR@ libvex.a EXTRA_CFLAGS="@ARCH_CORE_AM_CFLAGS@ @PIE_AM_CFLAGS@"
+       $(MAKE) -C @VEX_DIR@ CC=$(CC) libvex.a EXTRA_CFLAGS="@ARCH_CORE_AM_CFLAGS@ @PIE_AM_CFLAGS@"
 
 @VEX_DIR@/priv/main/vex_svnversion.h: $(wildcard @VEX_DIR@/.svn/entries)
-       $(MAKE) -C @VEX_DIR@ version
+       $(MAKE) -C @VEX_DIR@ CC=$(CC) version
 
 clean-local:
-       $(MAKE) -C @VEX_DIR@ clean
+       $(MAKE) -C @VEX_DIR@ CC=$(CC) clean
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 

diff --git a/coregrind/m_dispatch/Makefile.am b/coregrind/m_dispatch/Makefile.am
index 7a94a72f4243938b91986cc021a37c6dc9aee304..84d5a201b4ea0fe1700b89c1ffd93d8de5f7a37d 100644 (file)
--- a/coregrind/m_dispatch/Makefile.am
+++ b/coregrind/m_dispatch/Makefile.am
@@ -13,4 +13,4 @@ libdispatch_a_SOURCES = \
 dispatch-@VG_ARCH@.S: libvex_guest_offsets.h
 
 libvex_guest_offsets.h:
-       $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h
+       $(MAKE) -C @VEX_DIR@ CC=$(CC) pub/libvex_guest_offsets.h

diff --git a/coregrind/m_syswrap/Makefile.am b/coregrind/m_syswrap/Makefile.am
index bd66013e86656fb91f6ee7cc14f35087d9808c29..a0e7d2eeec8b6e788a882f619a7fec322037b103 100644 (file)
--- a/coregrind/m_syswrap/Makefile.am
+++ b/coregrind/m_syswrap/Makefile.am
@@ -26,4 +26,4 @@ syscall-@VG_PLATFORM@.S: libvex_guest_offsets.h
 syswrap-main.c: libvex_guest_offsets.h
 
 libvex_guest_offsets.h:
-       $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h
+       $(MAKE) -C @VEX_DIR@ CC=$(CC) pub/libvex_guest_offsets.h