summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-01-19 00:01:15 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-01-19 00:01:15 +0000
commit06f38e5fc22bbeadabc1be11eb77f6d27cd3140c (patch)
treec020ad9a6ec32882768c72d2ec2fa29873120037 /Makefile
parentd057f7d5eec11c118af2a0620cb06495f03ca8b3 (diff)
downloadcompiler-rt-06f38e5fc22bbeadabc1be11eb77f6d27cd3140c.tar.gz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 79149e325..95c02a666 100644
--- a/Makefile
+++ b/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.