[llvm-commits] [compiler-rt] r173465 - /compiler-rt/trunk/make/platform/clang_darwin.mk

[Eric Christopher]

Sweet. Thanks Daniel :)

-eric


On Fri, Jan 25, 2013 at 10:09 AM, Daniel Dunbar <daniel at zuster.org> wrote:

> Author: ddunbar
> Date: Fri Jan 25 12:09:28 2013
> New Revision: 173465
>
> URL: http://llvm.org/viewvc/llvm-project?rev=173465&view=rev
> Log:
> [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.
>
> Modified:
>     compiler-rt/trunk/make/platform/clang_darwin.mk
>
> Modified: compiler-rt/trunk/make/platform/clang_darwin.mk
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_darwin.mk?rev=173465&r1=173464&r2=173465&view=diff
>
> ==============================================================================
> --- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
> +++ compiler-rt/trunk/make/platform/clang_darwin.mk Fri Jan 25 12:09:28
> 2013
> @@ -83,12 +83,14 @@
>  # 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.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130125/d87223fa/attachment.html>