diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2013-01-25 18:09:28 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2013-01-25 18:09:28 +0000 |
| commit | 7ce46daf86200776204e6ba3ae4fef4ff71808c4 (patch) | |
| tree | 15a915d5b22334a79aa73be857934f6e654e63c5 /make/platform | |
| parent | 9a22a3dab8a3284af86203843a41e2b35e617b09 (diff) | |
| download | compiler-rt-7ce46daf86200776204e6ba3ae4fef4ff71808c4.tar.gz compiler-rt-7ce46daf86200776204e6ba3ae4fef4ff71808c4.tar.bz2 compiler-rt-7ce46daf86200776204e6ba3ae4fef4ff71808c4.tar.xz | |
[build/clang_darwin] Don't try to run sw_vers if we don't have it.
- Also, fix the test this is guarding, which was backwards.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@173465 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make/platform')
| -rw-r--r-- | make/platform/clang_darwin.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk index 99039846..7f8b4d71 100644 --- a/make/platform/clang_darwin.mk +++ b/make/platform/clang_darwin.mk @@ -83,12 +83,14 @@ 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 sw_vers -productVersion | grep 10.6),) +ifneq ($(shell which sw_vers),) +ifeq ($(shell 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 +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. |