summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Laird <danieljlaird@hotmail.com>2008-11-06 12:54:29 (GMT)
committer Daniel Laird <danieljlaird@hotmail.com>2008-11-06 12:54:29 (GMT)
commitfd3bb17cbb87e2cbcc6dce5b70c87daa2904a95d (patch)
tree9d71606e6c3e095829f24119a05e46081352a259
parentbf0b23bd24d83ab5d627cc5ebd07af4d726da920 (diff)
downloadbuildroot-fd3bb17cbb87e2cbcc6dce5b70c87daa2904a95d.tar.gz
buildroot-fd3bb17cbb87e2cbcc6dce5b70c87daa2904a95d.tar.bz2
package/Makefile.in: rpath setup for toolchains.
Apply the patch I posted some time ago that fixes rpath issues with external toolchains. Has been tested by users of buildroot and feedback looks good. Signed-off-by: Thomas Petazzoni Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
-rw-r--r--package/Makefile.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 431ca8e..9de8bf4 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -39,7 +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+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib -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 +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+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib
endif
#########################################################################
#ifeq ($(BR2_ROOTFS_SUFFIX),)
@@ -196,7 +196,8 @@ GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX))
TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
AR="$(TARGET_AR)" \
AS="$(TARGET_AS)" \
- LD="$(TARGET_LD) $(TARGET_LDFLAGS)" \
+ LD="$(TARGET_LD)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
NM="$(TARGET_NM)" \
CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
GCC="$(TARGET_CC) $(TARGET_CFLAGS)" \