| Message ID | 1467561610-24799-1-git-send-email-yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Commit | 5c177415eedc7181dde4308cb267e0f811020f18 |
| Headers | show |
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes: > When we build the list of patches to include to compute the hash for > ccache, a typo precented the special gcc-initial/ and gcc-final/ > directories from a global patch dir to be included in the caclculation. > Fix that by properly expanding the $(PKG) variable. > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: He Chunhui <hchunhui@mail.ustc.edu.cn> Committed, thanks.
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index f324f99..d2359a3 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -252,8 +252,8 @@ HOST_GCC_COMMON_CCACHE_HASH_FILES += $(DL_DIR)/$(GCC_SOURCE) HOST_GCC_COMMON_CCACHE_HASH_FILES += \ $(sort $(wildcard \ package/gcc/$(GCC_VERSION)/*.patch \ - $(addsuffix /$((PKG)_RAWNAME)/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ - $(addsuffix /$((PKG)_RAWNAME)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ + $(addsuffix /$($(PKG)_RAWNAME)/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ + $(addsuffix /$($(PKG)_RAWNAME)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ $(addsuffix /gcc/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ $(addsuffix /gcc/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))))) ifeq ($(BR2_xtensa),y)
When we build the list of patches to include to compute the hash for ccache, a typo precented the special gcc-initial/ and gcc-final/ directories from a global patch dir to be included in the caclculation. Fix that by properly expanding the $(PKG) variable. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: He Chunhui <hchunhui@mail.ustc.edu.cn> --- package/gcc/gcc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)