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 | 562fe1af43a19f7daf3793e83e203739fdb20895 (patch) | |
| tree | 1c1d0eeeb5c04db13e3b8b527392fc300ce11f16 /compiler-rt | |
| parent | bd5dfe4511859a5695c6a82097da7722525d4695 (diff) | |
| download | bcm5719-llvm-562fe1af43a19f7daf3793e83e203739fdb20895.tar.gz bcm5719-llvm-562fe1af43a19f7daf3793e83e203739fdb20895.zip | |
[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.
llvm-svn: 173465
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/make/platform/clang_darwin.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler-rt/make/platform/clang_darwin.mk b/compiler-rt/make/platform/clang_darwin.mk index 99039846858..7f8b4d713bc 100644 --- a/compiler-rt/make/platform/clang_darwin.mk +++ b/compiler-rt/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. |
