Allow UniversalArchs variable to be overridden on a per-config basis.

llvm-svn: 93816

compiler-rt/Makefile

@@ -136,7 +136,9 @@ $(call Set,Tmp.ObjPath,$(ProjObjRoot)/$(Tmp.Name)/$(Tmp.Config))
 # not.
 $(call Set,Tmp.ArchsToBuild,\
   $(if $(call IsDefined,$(Tmp.Key).UniversalArchs),\
-       $($(Tmp.Key).UniversalArchs),\
+       $(strip \
+         $(or $($(Tmp.Key).UniversalArchs.$(Tmp.Config)),\
+              $($(Tmp.Key).UniversalArchs))),\
        $(call VarOrDefault,$(Tmp.Key).Arch.$(Tmp.Config),$($(Tmp.Key).Arch))))
 
 # Copy or lipo to create the per-config library.

compiler-rt/make/lib_platforms.mk

@@ -3,8 +3,8 @@
 # This should be included following 'lib_util.mk'.
 
 # The simple variables configurations can define.
-PlainConfigVariables := Configs UniversalArchs Description
-PerConfigVariables := Arch $(AvailableOptions)
+PlainConfigVariables := Configs Description
+PerConfigVariables := UniversalArchs Arch $(AvailableOptions)
 RequiredConfigVariables := Configs Description
 
 ###