X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=2214433406743cc061986ac269b160264b10fffb;hb=ae253edfbee3ada91ff5eda5e1c5dbb43a734700;hp=6b081bba55dd29ca1618a217dee0efd29d99eeac;hpb=14ac8769b2833e62eea2248296bc60e536aefe00;p=openwrt%2Fopenwrt.git

diff --git a/rules.mk b/rules.mk
index 6b081bba55..2214433406 100644
--- a/rules.mk
+++ b/rules.mk
@@ -29,7 +29,7 @@ merge=$(subst $(space),,$(1))
 confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
 strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
 
-_SINGLE=MAKEFLAGS=$(space)
+_SINGLE=export MAKEFLAGS=$(space);
 ARCH:=$(call qstrip,$(shell echo $(CONFIG_ARCH) | sed -e 's/i[3-9]86/i386/'))
 BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
 TARGET_OPTIMIZATION:=$(call qstrip,$(CONFIG_TARGET_OPTIMIZATION))
@@ -65,7 +65,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)
 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
+TARGET_LDFLAGS:=-L$(TOOLCHAIN_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
   -include $(TOOLCHAIN_DIR)/info.mk
@@ -97,6 +97,7 @@ HOST_CFLAGS:=-O2 -I$(STAGING_DIR_HOST)/include
 HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib
 
 TARGET_CC:=$(TARGET_CROSS)gcc
+TARGET_CXX:=$(TARGET_CROSS)g++
 STRIP:=$(STAGING_DIR_HOST)/bin/sstrip
 PATCH:=$(SCRIPT_DIR)/patch-kernel.sh
 SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
@@ -120,7 +121,7 @@ TARGET_CONFIGURE_OPTS:= \
   NM=$(TARGET_CROSS)nm \
   CC="$(TARGET_CC)" \
   GCC="$(TARGET_CC)" \
-  CXX=$(TARGET_CROSS)g++ \
+  CXX="$(TARGET_CXX)" \
   RANLIB=$(TARGET_CROSS)ranlib \
   STRIP=$(TARGET_CROSS)strip \
   OBJCOPY=$(TARGET_CROSS)objcopy \