Revert "Add -rpath option for host package compilation"

Closes #1789

This reverts commit 6b939d40f6a29a43277566adc9d4312d49cb3abf.

The problem this commit tries to fix is valid, but the fix unfortunately
seems to cause worse problems on certain distributions/setups, so revert
for now.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index c6b64c0fabe473b6d791ac6668ec4a2ef633ee05..26dab3cd0a9e958bee8db066efe9b33803a2cb6f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@
 
        Issues resolved (http://bugs.uclibc.org):
 
+       #1789: binutils fails to build for i386
        #1843: Fix libcap build failure
 
 2010.05-rc3, Released May 27th, 2010:

diff --git a/package/Makefile.in b/package/Makefile.in
index 7ac429c81ea121499697bc09cc9d26af6b2f1763..eeb945022a6923b07ef24593103789008fd121ec 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -77,11 +77,6 @@ ifeq ($(BR2_LARGEFILE),y)
 TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
-# Host packages are sometimes linked against host libraries installed
-# in $(HOST_DIR)/usr/lib. As we cannot add $(HOST_DIR)/usr/lib to
-# LD_LIBRARY_PATH when building target packages because it causes
-# libtool breakage, we force a rpath to be added to host binaries.
-HOST_CFLAGS+=-Wl,-rpath -Wl,$(HOST_DIR)/usr/lib
 
 #########################################################################
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)