[llvm-commits] [compiler-rt] r93816 - in /compiler-rt/trunk: Makefile make/lib_platforms.mk

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jan 18 18:01:15 2010
New Revision: 93816

URL: http://llvm.org/viewvc/llvm-project?rev=93816&view=rev
Log:
Allow UniversalArchs variable to be overridden on a per-config basis.

Modified:
    compiler-rt/trunk/Makefile
    compiler-rt/trunk/make/lib_platforms.mk

Modified: compiler-rt/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/Makefile?rev=93816&r1=93815&r2=93816&view=diff

==============================================================================
--- compiler-rt/trunk/Makefile (original)
+++ compiler-rt/trunk/Makefile Mon Jan 18 18:01:15 2010
@@ -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.

Modified: compiler-rt/trunk/make/lib_platforms.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/lib_platforms.mk?rev=93816&r1=93815&r2=93816&view=diff

==============================================================================
--- compiler-rt/trunk/make/lib_platforms.mk (original)
+++ compiler-rt/trunk/make/lib_platforms.mk Mon Jan 18 18:01:15 2010
@@ -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
 
 ###