diff options
| -rw-r--r-- | compiler-rt/Makefile | 4 | ||||
| -rw-r--r-- | compiler-rt/make/lib_platforms.mk | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile index 79149e32529..95c02a666e5 100644 --- a/compiler-rt/Makefile +++ b/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. diff --git a/compiler-rt/make/lib_platforms.mk b/compiler-rt/make/lib_platforms.mk index 5557374738e..9cf9704fd17 100644 --- a/compiler-rt/make/lib_platforms.mk +++ b/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 ### |
