X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=utils%2Fvalgrind%2FMakefile;h=20699ca54e5a9ceb7be2ced90a6794084780ab18;hp=4db3d5a19cf7616245cdff8347f89e96d2b3f293;hb=41a41f147e0ac757f9085cfded123fcb7cf38241;hpb=13fb59dd0549e4f09ae3600298eda16396cb95f1

diff --git a/utils/valgrind/Makefile b/utils/valgrind/Makefile
index 4db3d5a19c..20699ca54e 100644
--- a/utils/valgrind/Makefile
+++ b/utils/valgrind/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://valgrind.org/downloads/
 PKG_MD5SUM:=978847992b136c8d8cb5c6559a91df1c
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/valgrind
@@ -50,9 +47,18 @@ CONFIGURE_ARGS += \
 
 DEFAULT_SUPP += "uclibc.supp"
 
-define Build/Compile	
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) -c -o $(PKG_BUILD_DIR)/abort.o ./src/abort.c
+	$(TARGET_CROSS)ar rcu $(PKG_BUILD_DIR)/abort.a $(PKG_BUILD_DIR)/abort.o
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		AM_CFLAGS_X86_LINUX="$(TARGET_CFLAGS)" \
+		AM_CFLAGS_AMD64_LINUX="$(TARGET_CFLAGS)" \
+		AM_CFLAGS_PPC32_LINUX="$(TARGET_CFLAGS)" \
+		AM_CFLAGS_PPC64_LINUX="$(TARGET_CFLAGS)" \
+		TOOL_LDADD_COMMON="-lgcc $(PKG_BUILD_DIR)/abort.a" \
 		all install
 endef