From ed595282e6dc40bc1f3bc43fa3a109383930fae3 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Mon, 15 Apr 2013 22:38:18 -0700 Subject: [PATCH 2001/2002] MacPorts Only: Comment out SL cctools workaround Signed-off-by: Jeremy Huddleston Sequoia (cherry picked from commit 2972ffafff4a394f521986b47810324cd1b7e3ba) --- make/platform/clang_darwin.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git llvm_release_34/projects/compiler-rt/make/platform/clang_darwin.mk macports_release_34/projects/compiler-rt/make/platform/clang_darwin.mk index ddb7029..c13063c 100644 --- llvm_release_34/projects/compiler-rt/make/platform/clang_darwin.mk +++ macports_release_34/projects/compiler-rt/make/platform/clang_darwin.mk @@ -101,12 +101,12 @@ UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx) # object files. If we are on that platform, strip out all ARM archs. We still # build the libraries themselves so that Clang can find them where it expects # them, even though they might not have an expected slice. -ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),) -UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios)) -UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext)) -UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5)) -UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios)) -endif +#ifneq ($(shell test -x /usr/bin/sw_vers && sw_vers -productVersion | grep 10.6),) +#UniversalArchs.ios := $(filter-out armv7, $(UniversalArchs.ios)) +#UniversalArchs.cc_kext := $(filter-out armv7, $(UniversalArchs.cc_kext)) +#UniversalArchs.cc_kext_ios5 := $(filter-out armv7, $(UniversalArchs.cc_kext_ios5)) +#UniversalArchs.profile_ios := $(filter-out armv7, $(UniversalArchs.profile_ios)) +#endif # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we # are intended to support and limit what we try to build to that. -- 2.2.2