Index: rules.mk
===================================================================
--- rules.mk    (revision 29641)
+++ rules.mk    (working copy)
@@ -108,8 +108,8 @@

 TARGET_PATH:=$(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$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+TARGET_CPPFLAGS:=
+TARGET_LDFLAGS:=
 ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 LIBGCC_S_PATH=$(realpath $(wildcard $(call qstrip,$(CONFIG_LIBGCC_ROOT_DIR))/$(call qstrip,$(CONFIG_LIBGCC_FILE_SPEC))))
 LIBGCC_S=$(if $(LIBGCC_S_PATH),-L$(dir $(LIBGCC_S_PATH)) -lgcc_s)
@@ -129,9 +129,9 @@
     export GCC_HONOUR_COPTS:=0
     TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-)
     TARGET_CFLAGS+= -fhonour-copts
-    TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include -I$(TOOLCHAIN_DIR)/include
-    TARGET_LDFLAGS+= -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib
-    TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)
+    TARGET_CPPFLAGS+=
+    TARGET_LDFLAGS+=
+    TARGET_PATH:=$(STAGING_DIR)/bin:$(TARGET_PATH)
   else
     ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
       TARGET_CROSS:=$(call qstrip,$(CONFIG_TOOLCHAIN_PREFIX))
Index: target/Makefile
===================================================================
--- target/Makefile (revision 29641)
+++ target/Makefile (working copy)
@@ -13,9 +13,34 @@
 $(curdir)/imagebuilder/prepare:=$(curdir)/linux/install

 $(eval $(call stampfile,$(curdir),target,prereq,.config))
+$(eval $(call stampfile,$(curdir),target,toolchain,.toolchain.list))
 $(eval $(call stampfile,$(curdir),target,compile,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),target,install,$(TMP_DIR)/.build))

+.toolchain.list:
+   @echo "Copying toolchain into staging dir ..."
+   @xargs rm -vrf < "$(STAGING_DIR)/.toolchain.list"
+   @rm -f "$(STAGING_DIR)/.toolchain.list"
+   binaries=""; \
+   for dir in bin sbin include lib libexec $(GNU_TARGET_NAME)* usr/bin usr/sbin usr/include usr/lib usr/libexec usr/$(GNU_TARGET_NAME)*; do \
+       test -d "$(TOOLCHAIN_DIR)/$$dir" && (cd "$(TOOLCHAIN_DIR)"; find "$$dir" ! -type d) | \
+       while read path; do \
+           mkdir -p "$(STAGING_DIR)/$${path%/*}"; \
+           ln -vf "$(TOOLCHAIN_DIR)/$$path" "$(STAGING_DIR)/$$path"; \
+           echo "$(STAGING_DIR)/$$path" >> "$(STAGING_DIR)/.toolchain.list"; \
+           test -L "$(STAGING_DIR)/$$path" || \
+           case "$$path" in *-gcc|*-g++|*-ld) \
+               mv -v "$(STAGING_DIR)/$$path" "$(STAGING_DIR)/$$path.bin"; \
+               echo "$(STAGING_DIR)/$$path.bin" >> "$(STAGING_DIR)/.toolchain.list"; \
+               echo '#!/bin/sh' > "$(STAGING_DIR)/$$path"; \
+               echo 'exec $$0.bin --sysroot=$(STAGING_DIR) "$$@"' >> "$(STAGING_DIR)/$$path"; \
+               chmod -v +x "$(STAGING_DIR)/$$path"; \
+           ;; esac; \
+       done; \
+   done; \
+   true
+
+$($(curdir)/stamp-compile): $($(curdir)/stamp-toolchain)
 $($(curdir)/stamp-install): $($(curdir)/stamp-compile)

 $(eval $(call subdir,$(curdir)))