|
From: <sv...@va...> - 2005-08-29 12:38:21
|
Author: sewardj Date: 2005-08-29 13:38:15 +0100 (Mon, 29 Aug 2005) New Revision: 4560 Log: Merge r4559 (Pass $(CC) to the vex Makefile.) Modified: branches/VALGRIND_3_0_BRANCH/coregrind/Makefile.am branches/VALGRIND_3_0_BRANCH/coregrind/m_dispatch/Makefile.am branches/VALGRIND_3_0_BRANCH/coregrind/m_syswrap/Makefile.am Modified: branches/VALGRIND_3_0_BRANCH/coregrind/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/VALGRIND_3_0_BRANCH/coregrind/Makefile.am 2005-08-29 12:11:0= 6 UTC (rev 4559) +++ branches/VALGRIND_3_0_BRANCH/coregrind/Makefile.am 2005-08-29 12:38:1= 5 UTC (rev 4560) @@ -198,13 +198,13 @@ || rm -f $@ =20 @VEX_DIR@/libvex.a: @VEX_DIR@/priv/main/vex_svnversion.h - $(MAKE) -C @VEX_DIR@ libvex.a EXTRA_CFLAGS=3D"@ARCH_CORE_AM_CFLAGS@ @PI= E_AM_CFLAGS@" + $(MAKE) -C @VEX_DIR@ CC=3D$(CC) libvex.a EXTRA_CFLAGS=3D"@ARCH_CORE_AM_= CFLAGS@ @PIE_AM_CFLAGS@" =20 @VEX_DIR@/priv/main/vex_svnversion.h: $(wildcard @VEX_DIR@/.svn/entries) - $(MAKE) -C @VEX_DIR@ version + $(MAKE) -C @VEX_DIR@ CC=3D$(CC) version =20 clean-local: - $(MAKE) -C @VEX_DIR@ clean + $(MAKE) -C @VEX_DIR@ CC=3D$(CC) clean =20 MANUAL_DEPS =3D $(noinst_HEADERS) $(include_HEADERS) =20 Modified: branches/VALGRIND_3_0_BRANCH/coregrind/m_dispatch/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/VALGRIND_3_0_BRANCH/coregrind/m_dispatch/Makefile.am 2005-08= -29 12:11:06 UTC (rev 4559) +++ branches/VALGRIND_3_0_BRANCH/coregrind/m_dispatch/Makefile.am 2005-08= -29 12:38:15 UTC (rev 4560) @@ -13,4 +13,4 @@ dispatch-@VG_ARCH@.S: libvex_guest_offsets.h =20 libvex_guest_offsets.h: - $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h + $(MAKE) -C @VEX_DIR@ CC=3D$(CC) pub/libvex_guest_offsets.h Modified: branches/VALGRIND_3_0_BRANCH/coregrind/m_syswrap/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/VALGRIND_3_0_BRANCH/coregrind/m_syswrap/Makefile.am 2005-08-= 29 12:11:06 UTC (rev 4559) +++ branches/VALGRIND_3_0_BRANCH/coregrind/m_syswrap/Makefile.am 2005-08-= 29 12:38:15 UTC (rev 4560) @@ -26,4 +26,4 @@ syswrap-main.c: libvex_guest_offsets.h =20 libvex_guest_offsets.h: - $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h + $(MAKE) -C @VEX_DIR@ CC=3D$(CC) pub/libvex_guest_offsets.h |