|
From: <sv...@va...> - 2008-05-15 17:48:17
|
Author: bart Date: 2008-05-15 18:48:03 +0100 (Thu, 15 May 2008) New Revision: 8096 Log: Removed the BUILD_CC variable again. Modified: branches/CROSS_COMPILATION/Makefile.tool.am branches/CROSS_COMPILATION/coregrind/Makefile.am Modified: branches/CROSS_COMPILATION/Makefile.tool.am =================================================================== --- branches/CROSS_COMPILATION/Makefile.tool.am 2008-05-15 12:59:09 UTC (rev 8095) +++ branches/CROSS_COMPILATION/Makefile.tool.am 2008-05-15 17:48:03 UTC (rev 8096) @@ -51,43 +51,43 @@ ##.PHONY: @VEX_DIR@/libvex.a @VEX_DIR@/libvex_x86_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h - $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" \ + $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ libvex_x86_linux.a \ EXTRA_CFLAGS="$(AM_CFLAGS_X86_LINUX) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" @VEX_DIR@/libvex_amd64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h - $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" \ + $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ libvex_amd64_linux.a \ EXTRA_CFLAGS="$(AM_CFLAGS_AMD64_LINUX) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" @VEX_DIR@/libvex_ppc32_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h - $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" \ + $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ libvex_ppc32_linux.a \ EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_LINUX) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" @VEX_DIR@/libvex_ppc64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h - $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" \ + $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ libvex_ppc64_linux.a \ EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_LINUX) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" @VEX_DIR@/libvex_ppc32_aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h - $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB) -X32" \ + $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR) -X32" \ libvex_ppc32_aix5.a \ EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_AIX5) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" @VEX_DIR@/libvex_ppc64_aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h - $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB) -X64" \ + $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR) -X64" \ libvex_ppc64_aix5.a \ EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_AIX5) @FLAG_WDECL_AFTER_STMT@ \ @FLAG_FNO_STACK_PROTECTOR@" @VEX_DIR@/priv/main/vex_svnversion.h: - $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" version + $(MAKE) -C @VEX_DIR@ CC="$(CC)" version TOOL_LDADD_COMMON = -lgcc TOOL_LDFLAGS_COMMON_LINUX = -static \ Modified: branches/CROSS_COMPILATION/coregrind/Makefile.am =================================================================== --- branches/CROSS_COMPILATION/coregrind/Makefile.am 2008-05-15 12:59:09 UTC (rev 8095) +++ branches/CROSS_COMPILATION/coregrind/Makefile.am 2008-05-15 17:48:03 UTC (rev 8096) @@ -298,7 +298,7 @@ libcoregrind_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) libcoregrind_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) libcoregrind_ppc32_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) -libcoregrind_ppc32_aix5_a_AR = $(RANLIB) -X32 cru +libcoregrind_ppc32_aix5_a_AR = $(AR) -X32 cru libcoregrind_ppc64_aix5_a_SOURCES = \ $(COREGRIND_SOURCES_COMMON) \ @@ -312,7 +312,7 @@ libcoregrind_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) libcoregrind_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) libcoregrind_ppc64_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) -libcoregrind_ppc64_aix5_a_AR = $(RANLIB) -X64 cru +libcoregrind_ppc64_aix5_a_AR = $(AR) -X64 cru libreplacemalloc_toolpreload_x86_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c @@ -334,12 +334,12 @@ libreplacemalloc_toolpreload_ppc32_aix5_a_SOURCES = m_replacemalloc/vg_replace_malloc.c libreplacemalloc_toolpreload_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) libreplacemalloc_toolpreload_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -fpic -fno-omit-frame-pointer -libreplacemalloc_toolpreload_ppc32_aix5_a_AR = $(RANLIB) -X32 cru +libreplacemalloc_toolpreload_ppc32_aix5_a_AR = $(AR) -X32 cru libreplacemalloc_toolpreload_ppc64_aix5_a_SOURCES = m_replacemalloc/vg_replace_malloc.c libreplacemalloc_toolpreload_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) libreplacemalloc_toolpreload_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -fpic -fno-omit-frame-pointer -libreplacemalloc_toolpreload_ppc64_aix5_a_AR = $(RANLIB) -X64 cru +libreplacemalloc_toolpreload_ppc64_aix5_a_AR = $(AR) -X64 cru m_dispatch/dispatch-x86-linux.S: libvex_guest_offsets.h m_dispatch/dispatch-amd64-linux.S: libvex_guest_offsets.h @@ -356,7 +356,7 @@ m_syswrap/syswrap-main.c: libvex_guest_offsets.h libvex_guest_offsets.h: - $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" pub/libvex_guest_offsets.h + $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" pub/libvex_guest_offsets.h VGPRELOAD_CORE_SOURCES_COMMON = vg_preloaded.c @@ -391,7 +391,7 @@ vgpreload_core_ppc64_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_AIX5) clean-local: - $(MAKE) -C @VEX_DIR@ CC="$(CC)" RANLIB="$(RANLIB)" clean + $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" clean MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) |