Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove the old (and nonworking) hack and identify our patched GCCs properly

Browse source 
SVN-Revision: 36189
This commit is contained in:
Imre Kaloz 2013-04-03 10:41:07 +00:00
parent 9b3b0473ae
commit 84d0582ddb
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
toolchain/gcc/common.mk
View file

@ -63,6 +63,11 @@ endif
PATCH_DIR=../patches/$(GCC_VERSION) PATCH_DIR=../patches/$(GCC_VERSION)
BUGURL=https://dev.openwrt.org/ BUGURL=https://dev.openwrt.org/
ifeq ($(findstring linaro, $(CONFIG_GCC_VERSION)),linaro)
PKGVERSION=OpenWrt/Linaro GCC $(PKG_REV) $(REVISION)
else
PKGVERSION=OpenWrt GCC $(PKG_VERSION) $(REVISION)
endif
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
@ -92,6 +97,8 @@ endif
GCC_CONFIGURE:= \ GCC_CONFIGURE:= \
SHELL="$(BASH)" \ SHELL="$(BASH)" \
$(HOST_SOURCE_DIR)/configure \ $(HOST_SOURCE_DIR)/configure \
--with-bugurl=$(BUGURL) \
--with-pkgversion="$(PKGVERSION)" \
--prefix=$(TOOLCHAIN_DIR) \ --prefix=$(TOOLCHAIN_DIR) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--host=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \

5
toolchain/gcc/minimal/Makefile
View file

@ -21,9 +21,8 @@ define Host/Prepare
ln -snf $(GCC_DIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) ln -snf $(GCC_DIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/
$(SED) 's,^MULTILIB_OSDIRNAMES,# MULTILIB_OSDIRNAMES,' $(HOST_BUILD_DIR)/gcc/config/*/t-* $(SED) 's,^MULTILIB_OSDIRNAMES,# MULTILIB_OSDIRNAMES,' $(HOST_BUILD_DIR)/gcc/config/*/t-*
$(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(HOST_BUILD_DIR)/gcc/version.c $(SED) 'd' $(HOST_BUILD_DIR)/gcc/DATESTAMP
$(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:$(BUGURL)>\2,' $(HOST_BUILD_DIR)/gcc/version.c $(SED) 'd' $(HOST_BUILD_DIR)/gcc/DEV-PHASE
$(SED) 's,http://gcc.gnu.org/bugs.html,$(BUGURL),' $(HOST_BUILD_DIR)/gcc/configure
#(cd $(HOST_BUILD_DIR)/libstdc++-v3; autoconf;); #(cd $(HOST_BUILD_DIR)/libstdc++-v3; autoconf;);
$(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_BUILD_DIR)/libstdc++-v3/configure $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(HOST_BUILD_DIR)/libstdc++-v3/configure
mkdir -p $(GCC_BUILD_DIR) mkdir -p $(GCC_BUILD_DIR)