gcc: use <pkg>_EXCLUDES, not <pkg>_TAR_EXCLUDES

As reported by Steven Noonan, the variable recently introduced in the
package infrastructure to exclude certain parts of an archive from
being extracted is <pkg>_EXCLUDES, not <pkg>_TAR_EXCLUDES. However,
the gcc code was incorrectly using <pkg>_TAR_EXCLUDES. This commit
fixes that.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reported-by: Steven Noonan <steven@uplinklabs.net>

diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 8ac296877b7efa3e296d97a549b99ce9969b0e99..0467ac293493f8f72bc097bb6a3cdd5ec2f64e32 100644 (file)
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -12,7 +12,7 @@ HOST_GCC_FINAL_DEPENDENCIES = \
        $(HOST_GCC_COMMON_DEPENDENCIES) \
        $(BR_LIBC)
 
-HOST_GCC_FINAL_TAR_EXCLUDES = $(HOST_GCC_TAR_EXCLUDES)
+HOST_GCC_FINAL_EXCLUDES = $(HOST_GCC_EXCLUDES)
 HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
 
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)

diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index 3ab47b9da00639d2716d0f40ea86ca239d4fbd44..1e58d8b5f78978334c4cf27080aa89115907ad6e 100644 (file)
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -10,7 +10,7 @@ GCC_INITIAL_SOURCE = $(GCC_SOURCE)
 
 HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
 
-HOST_GCC_INITIAL_TAR_EXCLUDES = $(HOST_GCC_TAR_EXCLUDES)
+HOST_GCC_INITIAL_EXCLUDES = $(HOST_GCC_EXCLUDES)
 HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
 
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 28eb75e0a88f6ca4634edbecf55e9f3f8c8187c9..b9551e89747fcfd430e4f5cee37ec15c64297e11 100644 (file)
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -48,7 +48,7 @@ define HOST_GCC_APPLY_PATCHES
        $(HOST_GCC_APPLY_POWERPC_PATCH)
 endef
 
-HOST_GCC_TAR_EXCLUDES = \
+HOST_GCC_EXCLUDES = \
        libjava/* libgo/* \
        gcc/testsuite/* libstdc++-v3/testsuite/*