From: lars Date: Sat, 13 Sep 2008 14:34:43 +0000 (+0000) Subject: Revert r12510. Remove -rpath-link form TARGET_LDFLAGS as it breaks some X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=efd888e4be8c8b29a77a06a7e6ae1318badf9719 Revert r12510. Remove -rpath-link form TARGET_LDFLAGS as it breaks some packages. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12597 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/rules.mk b/rules.mk index c8180dc1b..0e4c7f290 100644 --- a/rules.mk +++ b/rules.mk @@ -1,9 +1,10 @@ -# -# Copyright (C) 2006-2007 OpenWrt.org +# +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # +# $Id$ ifneq ($(__rules_inc),1) __rules_inc=1 @@ -65,7 +66,7 @@ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/host/bin:$(PATH) TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) $(if $(CONFIG_DEBUG),-g3) TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -TARGET_LDFLAGS:=-L$(TOOLCHAIN_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib +TARGET_LDFLAGS:=-L$(TOOLCHAIN_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) -include $(TOOLCHAIN_DIR)/info.mk