add missing uml include (patch from #955)

[openwrt.git] / toolchain / gcc / Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 7ef6005..a738345 100644 (file)
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -45,11 +45,10 @@ include $(INCLUDE_DIR)/host-build.mk
 BUILD_DIR1:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
 BUILD_DIR2:=$(TOOLCHAIN_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)
        (cd $(BUILD_DIR1); rm -f config.cache; \
 define Stage1/Configure
        mkdir -p $(BUILD_DIR1)
        (cd $(BUILD_DIR1); rm -f config.cache; \

+               SHELL="$(BASH)" \

                $(PKG_BUILD_DIR)/configure \
                --prefix=$(STAGING_DIR) \
                --build=$(GNU_HOST_NAME) \
                $(PKG_BUILD_DIR)/configure \
                --prefix=$(STAGING_DIR) \
                --build=$(GNU_HOST_NAME) \


@@ -65,10 +64,10 @@ define Stage1/Configure
        );
 endef
 define Stage1/Compile
        );
 endef
 define Stage1/Compile

-       $(MAKE) -C $(BUILD_DIR1) all-gcc
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) all-gcc

 endef
 define Stage1/Install
 endef
 define Stage1/Install

-       $(MAKE) -C $(BUILD_DIR1) install-gcc
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) install-gcc

 endef
 
 define Stage2/Configure
 endef
 
 define Stage2/Configure


@@ -79,6 +78,7 @@ define Stage2/Configure
        rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
        ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
        (cd $(BUILD_DIR2); rm -f config.cache; \
        rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
        ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
        (cd $(BUILD_DIR2); rm -f config.cache; \

+               SHELL="$(BASH)" \

                $(PKG_BUILD_DIR)/configure \
                --prefix=$(STAGING_DIR) \
                --build=$(GNU_HOST_NAME) \
                $(PKG_BUILD_DIR)/configure \
                --prefix=$(STAGING_DIR) \
                --build=$(GNU_HOST_NAME) \


@@ -93,10 +93,10 @@ define Stage2/Configure
        );
 endef
 define Stage2/Compile
        );
 endef
 define Stage2/Compile

-       $(MAKE) -C $(BUILD_DIR2) all
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR2) all

 endef
 define Stage2/Install
 endef
 define Stage2/Install

-       $(MAKE) -C $(BUILD_DIR2) install
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR2) install

        echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version
        # Set up the symlinks to enable lying about target name.
        set -e; \
        echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version
        # Set up the symlinks to enable lying about target name.
        set -e; \