enable native ipsec modules on 2.6, add ipsec kernel modules

[15.05/openwrt.git] / toolchain / gcc / Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 85691e6..7ef6005 100644 (file)
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -30,7 +30,7 @@ PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VER
        ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION)
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)
 
 TARGET_LANGUAGES:=c
 ifeq ($(CONFIG_INSTALL_LIBSTDCPP),y)
@@ -42,9 +42,10 @@ endif
 
 include $(INCLUDE_DIR)/host-build.mk
 
-BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
-BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-final
+BUILD_DIR1:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
+BUILD_DIR2:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-final
 
+override SHELL:=$(BASH)
 
 define Stage1/Configure
        mkdir -p $(BUILD_DIR1)
@@ -56,7 +57,7 @@ define Stage1/Configure
                --target=$(REAL_GNU_TARGET_NAME) \
                --enable-languages=c \
                --disable-shared \
-               --with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+               --with-sysroot=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
                --disable-__cxa_atexit \
                --enable-target-optspace \
                --with-gnu-ld \
@@ -103,8 +104,8 @@ define Stage2/Install
                ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
                cd bin; \
                for app in $(REAL_GNU_TARGET_NAME)-* ; do \
-                       ln -sf $${app} \
-                       $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
+                       ln -sf $$$${app} \
+                       $(GNU_TARGET_NAME)$$$${app##$(REAL_GNU_TARGET_NAME)}; \
                done; \
        );
 endef