summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Laird <danieljlaird@hotmail.com>2008-10-22 12:47:53 +0000
committerDaniel Laird <danieljlaird@hotmail.com>2008-10-22 12:47:53 +0000
commitec65ef836f7bfe9da2ce6d57eccfbb1fe6ed9fd8 (patch)
tree61d45dffe754960fdb96f07fcc2f4f28cc10904d
parent6fd903a4deaa99fa2b1a482a5c775023f1a829ea (diff)
package/Makefile.in: Add -rpath-link
As per various email discussions add -rpath-link to the LDFLAGS. This definately fixes a few issues for Thomas and myself Any objections and it can be pulled again. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@...> Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
-rw-r--r--package/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 431ca8e78..6309fb6b0 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -39,7 +39,8 @@ 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+= -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
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
TARGET_LDFLAGS+= $(BR2_SYSROOT)
@@ -91,7 +92,8 @@ 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+= -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
endif
#########################################################################
#ifeq ($(BR2_ROOTFS_SUFFIX),)