[129514] trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch

[larryv at macports.org]

Revision: 129514
          https://trac.macports.org/changeset/129514
Author:   larryv at macports.org
Date:     2014-12-14 23:54:50 -0800 (Sun, 14 Dec 2014)
Log Message:
-----------
clang-3.6: Use xcrun fallback in compiler-rt makefile

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch

Modified: trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch	2014-12-15 07:13:24 UTC (rev 129513)
+++ trunk/dports/lang/llvm-3.6/files/lion-xcrun-fallback.patch	2014-12-15 07:54:50 UTC (rev 129514)
@@ -13,3 +13,28 @@
      if [ "$$?" != "0" ]; then result=""; fi; \
      echo $$result)
  ###
+diff --git a/tools/clang/runtime/compiler-rt/Makefile b/tools/clang/runtime/compiler-rt/Makefile
+index 95c9fb7..50f0a81 100644
+--- a/tools/clang/runtime/compiler-rt/Makefile
++++ b/tools/clang/runtime/compiler-rt/Makefile
+@@ -82,8 +82,18 @@ RuntimeLibrary.darwin.Configs := \
+ 	profile_osx.a \
+ 	ubsan_osx.a
+ 
+-IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
+-IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
++XCRunSdkPath = \
++  $(shell \
++    result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++    if [ "$$?" != "0" ]; then \
++      result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++              | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++    fi; \
++    if [ "$$?" != "0" ]; then result=""; fi; \
++    echo $$result)
++
++IOS_SDK := $(call XCRunSdkPath,iphoneos)
++IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
+ 
+ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
+ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141214/d2188963/attachment.html>