From mboxrd@z Thu Jan 1 00:00:00 1970 From: laird at uclibc.org Date: Wed, 22 Oct 2008 08:28:30 -0700 (PDT) Subject: [Buildroot] svn commit: trunk/buildroot/package Message-ID: <20081022152830.CCF373C666@busybox.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Author: laird Date: 2008-10-22 08:28:30 -0700 (Wed, 22 Oct 2008) New Revision: 23767 Log: 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 Modified: trunk/buildroot/package/Makefile.in Changeset: Modified: trunk/buildroot/package/Makefile.in =================================================================== --- trunk/buildroot/package/Makefile.in 2008-10-22 15:01:00 UTC (rev 23766) +++ trunk/buildroot/package/Makefile.in 2008-10-22 15:28:30 UTC (rev 23767) @@ -39,8 +39,7 @@ 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 @@ 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),)