Browse Source

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>
Thomas Petazzoni 9 years ago
parent
commit
4a8478b728

+ 1 - 1
package/gcc/gcc-final/gcc-final.mk

@@ -12,7 +12,7 @@ HOST_GCC_FINAL_DEPENDENCIES = \
 	$(HOST_GCC_COMMON_DEPENDENCIES) \
 	$(HOST_GCC_COMMON_DEPENDENCIES) \
 	$(BR_LIBC)
 	$(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
 HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
 
 
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)

+ 1 - 1
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_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
 HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
 
 
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
 ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)

+ 1 - 1
package/gcc/gcc.mk

@@ -48,7 +48,7 @@ define HOST_GCC_APPLY_PATCHES
 	$(HOST_GCC_APPLY_POWERPC_PATCH)
 	$(HOST_GCC_APPLY_POWERPC_PATCH)
 endef
 endef
 
 
-HOST_GCC_TAR_EXCLUDES = \
+HOST_GCC_EXCLUDES = \
 	libjava/* libgo/* \
 	libjava/* libgo/* \
 	gcc/testsuite/* libstdc++-v3/testsuite/*
 	gcc/testsuite/* libstdc++-v3/testsuite/*