gcc: pass MAKEINFO=missing in the environment rather than as a ./configure arg

Fixes a build issue with the avr32 toolchain:

http://jenkins.free-electrons.com/job/buildroot/config=atngw100_defconfig/104/

Invalid configuration `MAKEINFO=missing': machine `MAKEINFO=missing' not
recognized

Instead pass it in the environment of ./configure, similar to how it was
done originally in 62322acb2ce (toolchain/gcc: disable makeinfo).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index b62dfe2df4cabfea31a2552f00bb7fd7e3f6932d..328ad7b0a68947a1abc17121186792d1ad2a4ddc 100644 (file)
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -55,6 +55,9 @@ endif
 HOST_GCC_FINAL_CONF_OPT += \
        $(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
+HOST_GCC_FINAL_CONF_ENV = \
+       $(HOST_GCC_COMMON_CONF_ENV)
+
 # Make sure we have 'cc'
 define HOST_GCC_FINAL_CREATE_CC_SYMLINKS
        if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \

diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index e4684194523c2adf826c2742d209c99ee57d1a23..0eb492fa4dccc90b1b7002a220824bac2a117d90 100644 (file)
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -34,6 +34,9 @@ HOST_GCC_INITIAL_CONF_OPT = \
        --disable-nls \
        $(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
+HOST_GCC_INITIAL_CONF_ENV = \
+       $(HOST_GCC_COMMON_CONF_ENV)
+
 HOST_GCC_INITIAL_MAKE_OPT = all-gcc
 HOST_GCC_INITIAL_INSTALL_OPT = install-gcc
 

diff --git a/package/gcc/gcc-intermediate/gcc-intermediate.mk b/package/gcc/gcc-intermediate/gcc-intermediate.mk
index a6660256d7e9d24f0d3b9ad07ca63f865aae57a1..f47e4be1ba8d04ad76082ecfbc9e4cfad7398d15 100644 (file)
--- a/package/gcc/gcc-intermediate/gcc-intermediate.mk
+++ b/package/gcc/gcc-intermediate/gcc-intermediate.mk
@@ -33,6 +33,9 @@ HOST_GCC_INTERMEDIATE_CONF_OPT = \
        --disable-nls \
        $(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
+HOST_GCC_INTERMEDIATE_CONF_ENV = \
+       $(HOST_GCC_COMMON_CONF_ENV)
+
 HOST_GCC_INTERMEDIATE_MAKE_OPT = all-gcc
 ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
 HOST_GCC_INTERMEDIATE_MAKE_OPT += all-target-libgcc

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 782217fdd56998ec2ed6217ed85c7581fd0c85d4..ccba5e1586c085debb19b6b6fc5af803eef2c8d2 100644 (file)
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -96,7 +96,11 @@ HOST_GCC_COMMON_CONF_OPT = \
        --disable-libssp \
        --disable-multilib \
        --with-gmp=$(HOST_DIR)/usr \
-       --with-mpfr=$(HOST_DIR)/usr \
+       --with-mpfr=$(HOST_DIR)/usr
+
+# Don't build documentation. It takes up extra space / build time,
+# and sometimes needs specific makeinfo versions to work
+HOST_GCC_COMMON_CONF_ENV = \
        MAKEINFO=missing
 
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43810