From 0a6b2a1280ba76a95a377460c4275b962b6f63e2 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 4 Apr 2018 23:01:14 +0200 Subject: [PATCH] cache variables based on their types --- SCRAM/GMake/Makefile.rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SCRAM/GMake/Makefile.rules b/SCRAM/GMake/Makefile.rules index 3f85714d..cb61d3af 100644 --- a/SCRAM/GMake/Makefile.rules +++ b/SCRAM/GMake/Makefile.rules @@ -245,8 +245,8 @@ endef define AdjustFlags $(strip \ $(foreach f,$3,\ - $(if $(subst undefined,,$(origin ADJUST_$1_$f_COMP$4_FILE$5)),$(ADJUST_$1_$f_COMP$4_FILE$5),\ - $(eval ADJUST_$1_$f_COMP$4_FILE$5:=\ + $(if $(subst undefined,,$(origin ADJUST_$1_$f_COMP$4_FILE$5_TYPE_$(subst $(space),_,$2))),$(ADJUST_$1_$f_COMP$4_FILE$5_TYPE_$(subst $(space),_,$2)),\ + $(eval ADJUST_$1_$f_COMP$4_FILE$5_TYPE_$(subst $(space),_,$2):=\ $(strip \ $(USER_PRE_$f) \ $(filter-out \ @@ -256,7 +256,7 @@ $(strip \ $(strip $(foreach t,$2 $($1_CLASS),$($t_$f)) $($1_LOC_FLAGS_$f) $($(2)_LOC_FLAGS_$f) $(USER_$f))\ )\ )\ - $(ADJUST_$1_$f_COMP$4_FILE$5)\ + $(ADJUST_$1_$f_COMP$4_FILE$5_TYPE_$(subst $(space),_,$2))\ )\ )\ )