Allow UniversalArchs variable to be overridden on a per-config basis.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@93816 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Makefile b/Makefile
index 79149e3..95c02a6 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,9 @@
# 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.
diff --git a/make/lib_platforms.mk b/make/lib_platforms.mk
index 5557374..9cf9704 100644
--- a/make/lib_platforms.mk
+++ b/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
###