cache variables based on their types

cms-sw · Apr 4, 2018 · 0a6b2a1 · 0a6b2a1
1 parent 5057607
commit 0a6b2a1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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))\
     )\
   )\
 )