[openwrt/openwrt] toolchain: fix stampfile dependency

LEDE Commits lede-commits at lists.infradead.org
Sat Feb 25 04:49:16 PST 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/743c4ad6824a17a5ec102ef009684a70801bda62

commit 743c4ad6824a17a5ec102ef009684a70801bda62
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Fri Sep 9 21:43:18 2022 -0400

    toolchain: fix stampfile dependency
    
    Use the gcc/final/install target stampfile as the prerequisite
    for the toolchain/compile target stampfile.
    
    The previous filename was also incorrect,
    the stampfile name format was changed (see reference)
    but was never updated here.
    
    The issue was never noticed
    because the usage of timestamp.pl was broken
    (fixed in previous commit)
    causing the extra prereq files passed to 'call stampfile'
    to never get checked at all.
    
    Fixes: 5149ed151 ("gcc: split up the build process into three distinct stages")
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 toolchain/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 5dccf8f829..19b144ee36 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -85,12 +85,12 @@ $(curdir)/ := .config prereq
 $(curdir)//compile = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-compile)
 
 ifndef DUMP_TARGET_DB
-$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:
+$(TOOLCHAIN_DIR)/stamp/.gcc_final_installed:
 endif
 
 $(curdir)/install: $(curdir)/compile
 
-$(eval $(call stampfile,$(curdir),toolchain,compile,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR)))
+$(eval $(call stampfile,$(curdir),toolchain,compile,$(TOOLCHAIN_DIR)/stamp/.gcc_final_installed,,$(TOOLCHAIN_DIR)))
 $(eval $(call stampfile,$(curdir),toolchain,check,$(TMP_DIR)/.build))
 $(eval $(call subdir,$(curdir)))
 




More information about the lede-commits mailing list