aboutsummaryrefslogtreecommitdiff
path: root/ta
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2018-04-19 17:01:06 +0200
committerJérôme Forissier <jerome.forissier@linaro.org>2018-04-20 13:38:29 +0200
commita42a05af252014762c0caf9249380104b56521e9 (patch)
treeee1df27aef183b79d4486efb30cac9250c73d5e3 /ta
parentd2d2d58bd972a6cb28c03b85fb413d959f2683a8 (diff)
ta/ta.mk: make sure exported conf.mk is updated
Makes sure that conf.mk exported to TA dev kit is updated even if the change isn't due to a change in mk/config.mk Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'ta')
-rw-r--r--ta/ta.mk16
1 files changed, 9 insertions, 7 deletions
diff --git a/ta/ta.mk b/ta/ta.mk
index 7f42123b..558af132 100644
--- a/ta/ta.mk
+++ b/ta/ta.mk
@@ -111,14 +111,16 @@ $(foreach f, $(ta-scripts), \
conf-mk-file-export := $(out-dir)/export-$(sm)/mk/conf.mk
sm-$(conf-mk-file-export) := $(sm)
define mk-file-export
-$(conf-mk-file-export): $(conf-mk-file)
- @$$(cmd-echo-silent) ' GEN ' $$@
- $(q)echo sm := $$(sm-$(conf-mk-file-export)) > $$@
- $(q)echo sm-$$(sm-$(conf-mk-file-export)) := y >> $$@
- $(q)echo CFG_TA_FLOAT_SUPPORT := $$(CFG_TA_FLOAT_SUPPORT) >> $$@
+.PHONY: $(conf-mk-file-export)
+$(conf-mk-file-export):
+ @$$(cmd-echo-silent) ' CHK ' $$@
+ $(q)echo sm := $$(sm-$(conf-mk-file-export)) > $$@.tmp
+ $(q)echo sm-$$(sm-$(conf-mk-file-export)) := y >> $$@.tmp
+ $(q)echo CFG_TA_FLOAT_SUPPORT := $$(CFG_TA_FLOAT_SUPPORT) >> $$@.tmp
$(q)($$(foreach v, $$(ta-mk-file-export-vars-$$(sm-$(conf-mk-file-export))), \
- echo $$(v) := $$($$(v));)) >> $$@
- $(q)echo '$$(ta-mk-file-export-add-$$(sm-$(conf-mk-file-export)))' | sed 's/_nl_ */\n/g' >> $$@
+ echo $$(v) := $$($$(v));)) >> $$@.tmp
+ $(q)echo '$$(ta-mk-file-export-add-$$(sm-$(conf-mk-file-export)))' | sed 's/_nl_ */\n/g' >> $$@.tmp
+ $(q)$(call mv-if-changed,$$@.tmp,$$@)
endef
$(eval $(mk-file-export))