diff options
| author | Daniel Laird <danieljlaird@hotmail.com> | 2008-11-07 08:15:53 +0000 |
|---|---|---|
| committer | Daniel Laird <danieljlaird@hotmail.com> | 2008-11-07 08:15:53 +0000 |
| commit | 2dbf951819abb8a4079ff335a29a6a6ea5939b15 (patch) | |
| tree | 98eadcf4c4d4c5ccf090c2ab513a2e92dff66531 /package/Makefile.in | |
| parent | 8586e2a51b26afec2cecba1ba3c34ed35ae87743 (diff) | |
| download | buildroot-novena-2dbf951819abb8a4079ff335a29a6a6ea5939b15.tar.gz buildroot-novena-2dbf951819abb8a4079ff335a29a6a6ea5939b15.zip | |
package/Makefile.in: revert rpath setup for toolchains.
Revert the rpath patch, it looked good up until someone tried
to build a kernel as well. This seems to break as a result.
Will post a new patch soon and see how that goes..
Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>
Diffstat (limited to 'package/Makefile.in')
| -rw-r--r-- | package/Makefile.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index 9de8bf44c..431ca8e78 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 -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) @@ -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 -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),) @@ -196,8 +196,7 @@ 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)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + LD="$(TARGET_LD) $(TARGET_LDFLAGS)" \ NM="$(TARGET_NM)" \ CC="$(TARGET_CC) $(TARGET_CFLAGS)" \ GCC="$(TARGET_CC) $(TARGET_CFLAGS)" \ |