From ec65ef836f7bfe9da2ce6d57eccfbb1fe6ed9fd8 Mon Sep 17 00:00:00 2001 From: Daniel Laird Date: Wed, 22 Oct 2008 12:47:53 +0000 Subject: 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 Signed-off-by: Daniel Laird --- package/Makefile.in | 6 ++++-- 1 file 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),) -- cgit v1.2.3