defs.mk: Avoid recaching stale variable values #57

Merged
Jan Lindemann merged 1 commit from jan/fix/20260811-defs-mk-disable-build-pkg-config into master 2026-08-11 14:34:43 +02:00 AGit

View file

@ -32,6 +32,10 @@ clean.cache:
cache: $(CACHE_PROJECT_MK) cache: $(CACHE_PROJECT_MK)
$(CACHE_PROJECT_MK): $(CACHED_FILES) $(JWBDIR)/make/cache.mk $(CACHE_PROJECT_MK): $(CACHED_FILES) $(JWBDIR)/make/cache.mk
ifneq ($(wildcard $(CACHE_PROJECT_MK)),)
rm -f $@
make $@
else
@echo 'ifneq ($$(JW_PKG_NO_CACHE),true)' | tee $@.tmp @echo 'ifneq ($$(JW_PKG_NO_CACHE),true)' | tee $@.tmp
@echo $(foreach v,$(CACHED_VARS),$v = $(value $(v)) EOL) | \ @echo $(foreach v,$(CACHED_VARS),$v = $(value $(v)) EOL) | \
$(SED) 's/\s\+EOL/\n/g;' | \ $(SED) 's/\s\+EOL/\n/g;' | \
@ -42,3 +46,4 @@ $(CACHE_PROJECT_MK): $(CACHED_FILES) $(JWBDIR)/make/cache.mk
tee -a $@.tmp tee -a $@.tmp
@echo 'endif # ifneq ($$(JW_PKG_NO_CACHE),true)' | tee -a $@.tmp @echo 'endif # ifneq ($$(JW_PKG_NO_CACHE),true)' | tee -a $@.tmp
mv $@.tmp $@ mv $@.tmp $@
endif