| Message ID | 1397596177-10103-1-git-send-email-jon.loeliger@oracle.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Apr 15, 2014 at 04:09:37PM -0500, Jon Loeliger wrote: > Prior to this patch, the top-level linker script u-boot.lds > used a simple $(call if_changed) check when generated. > That mechanism misses cases where a possible include file > change induces a change in the u-boot.lds too. > > This patch converts it to a stronger check using ($call filechk) > that will also notice differences in file contents and > will catch changes due to pre-processing as well. > > Signed-off-by: Jon Loeliger <jon.loeliger@oracle.com> Applied to u-boot/master, thanks!
diff --git a/Makefile b/Makefile index b807e5c..dcc42b2 100644 --- a/Makefile +++ b/Makefile @@ -1052,12 +1052,13 @@ depend dep: @echo '*** Warning: make $@ is unnecessary now.' # --------------------------------------------------------------------------- -quiet_cmd_cpp_lds = LDS $@ -cmd_cpp_lds = $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \ - -x assembler-with-cpp -P -o $@ $< +define filechk_ubootlds + ($(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ \ + -x assembler-with-cpp -P -o - -) +endef u-boot.lds: $(LDSCRIPT) prepare FORCE - $(call if_changed,cpp_lds) + $(call filechk,ubootlds) PHONY += nand_spl nand_spl: prepare
Prior to this patch, the top-level linker script u-boot.lds used a simple $(call if_changed) check when generated. That mechanism misses cases where a possible include file change induces a change in the u-boot.lds too. This patch converts it to a stronger check using ($call filechk) that will also notice differences in file contents and will catch changes due to pre-processing as well. Signed-off-by: Jon Loeliger <jon.loeliger@oracle.com> --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)