summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Laird <danieljlaird@hotmail.com>2008-10-22 15:28:30 +0000
committerDaniel Laird <danieljlaird@hotmail.com>2008-10-22 15:28:30 +0000
commiteff04b41d3c5fa481b789d74e0b0f1568b485468 (patch)
tree143dec00460fe9273d47ff075664d52a5e354ded
parentab20262575add14e403a97e5f8ab52fcebfd3fe2 (diff)
package/Makefile.in: Remove rpath fix as it breaks Thomas png build
Remove my fix for rpath-link until I can find out why it works for me and not Thomas. Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
-rw-r--r--package/Makefile.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 6309fb6b0..431ca8e78 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -39,8 +39,7 @@ endif
ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
-TARGET_LDFLAGS+= -Wl,--rpath-link -Wl,$(STAGING_DIR)/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib
+TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
TARGET_LDFLAGS+= $(BR2_SYSROOT)
@@ -92,8 +91,7 @@ TARGET_CXXFLAGS=$(TARGET_CFLAGS)
else
TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(TOOLCHAIN_EXTERNAL_PATH)/$(TOOLCHAIN_EXTERNAL_PREFIX)/include
TARGET_CXXFLAGS=$(TARGET_CFLAGS)
-TARGET_LDFLAGS+= -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
-TARGET_LDFLAGS+= -Wl,--rpath-link -Wl,$(STAGING_DIR)/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib
+TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
endif
#########################################################################
#ifeq ($(BR2_ROOTFS_SUFFIX),)