Commit bc654322 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

toolchain: introduce HOSTCC_VERSION and fix gcc-4.3.x build with old host CCs 

gcc < 4.2.0 doesn't support -Wno-overlength-stings, but gcc-4.3.x configure
fails to detect that, breaking the build.

Work around it by detecting the host gcc version (and store in HOSTCC_VERSION)
and set the proper configure variables for gcc < 4.2.0.
parent 4bcbf87c

package/Makefile.in

+4 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ INSTALL=/usr/bin/install 
FLEX:=$(shell which flex || type -p flex)

BISON:=$(shell which bison || type -p bison)



# hostcc version as an integer - E.G. 4.3.2 => 432

HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \

	sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')



HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \

	-e 's/sparc.*/sparc/' \

	-e 's/arm.*/arm/g' \

toolchain/gcc/gcc-uclibc-4.x.mk

+9 −2
Original line number Diff line number Diff line
@@ -145,6 +145,13 @@ ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) 
GCC_DECIMAL_FLOAT:=--disable-decimal-float

endif



# gcc version < 4.2.0 don't have -Wno-overlength-strings and the configure

# script has problems detecting it, so help it

ifeq ($(shell test $(HOSTCC_VERSION) -lt 420 && echo OLD),OLD)

GCC_CONF_ENV:=acx_cv_prog_cc_pedantic__Wno_long_long__Wno_variadic_macros_____________Wno_overlength_strings=no \

	acx_cv_prog_cc_warning__Wno_overlength_strings=no

endif



HOST_SOURCE+=gcc-source



$(DL_DIR)/$(GCC_SOURCE):
@@ -227,7 +234,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched 
$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured

	# gcc >= 4.3.0 have to also build all-target-libgcc

ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)

	$(MAKE) -C $(GCC_BUILD_DIR1) all-gcc all-target-libgcc

	$(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc all-target-libgcc

else

	$(MAKE) -C $(GCC_BUILD_DIR1) all-gcc

endif
@@ -301,7 +308,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) 
	touch $@



$(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured

	$(MAKE) -C $(GCC_BUILD_DIR2) all

	$(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all

	touch $@



$(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled