[117563] trunk/dports/lang/llvm-3.4

[jeremyhu at macports.org]

Revision: 117563
          https://trac.macports.org/changeset/117563
Author:   jeremyhu at macports.org
Date:     2014-03-03 12:42:05 -0800 (Mon, 03 Mar 2014)
Log Message:
-----------
clang-3.4: Snow Leopard build fix

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.4/Portfile
    trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch

Modified: trunk/dports/lang/llvm-3.4/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.4/Portfile	2014-03-03 20:34:17 UTC (rev 117562)
+++ trunk/dports/lang/llvm-3.4/Portfile	2014-03-03 20:42:05 UTC (rev 117563)
@@ -233,6 +233,10 @@
             reinplace {/cc_kext_ios5/ s/^/#/} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk
             reinplace {s/cc_kext_ios5.a//} ${worksrcpath}/tools/clang/runtime/compiler-rt/Makefile
         }
+
+        reinplace "s|@@PREFIX@@|${prefix}|g" \
+            ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk \
+            ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
     }
 }
 

Modified: trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch	2014-03-03 20:34:17 UTC (rev 117562)
+++ trunk/dports/lang/llvm-3.4/files/0001-Comment-out-SL-cctools-workaround.patch	2014-03-03 20:42:05 UTC (rev 117563)
@@ -1,17 +1,21 @@
-From 5d32457c53bb0ae8abdafeceb1b622a7b7934de2 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Mon, 15 Apr 2013 22:38:18 -0700
-Subject: [PATCH] Comment out SL cctools workaround
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- make/platform/clang_darwin.mk | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
-index a5e22e6..6a4e956 100644
 --- a/projects/compiler-rt/make/platform/clang_darwin.mk
 +++ a/projects/compiler-rt/make/platform/clang_darwin.mk
+@@ -47,10 +47,10 @@ XCRunSdkPath = \
+ 
+ CC       := $(call XCRun,clang)
+-AR       := $(call XCRun,ar)
+-RANLIB   := $(call XCRun,ranlib)
+-STRIP    := $(call XCRun,strip)
+-LIPO     := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR       := @@PREFIX@@/bin/ar
++RANLIB   := @@PREFIX@@/bin/ranlib
++STRIP    := @@PREFIX@@/bin/strip
++LIPO     := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+ 
+ Configs :=
+ UniversalArchs :=
 @@ -83,12 +83,12 @@ UniversalArchs.ubsan_osx := $(call Check
  # 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
@@ -31,6 +35,22 @@
  
  # 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.
--- 
-1.8.2.1
-
+--- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk	2014-03-03 10:11:37.000000000 -0800
++++ a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk	2014-03-03 12:08:37.000000000 -0800
+@@ -33,11 +33,11 @@ XCRun = \
+ ###
+ 
+ CC       := $(call XCRun,clang)
+-AR       := $(call XCRun,ar)
+-RANLIB   := $(call XCRun,ranlib)
+-STRIP    := $(call XCRun,strip)
+-LIPO     := $(call XCRun,lipo)
+-DSYMUTIL := $(call XCRun,dsymutil)
++AR       := @@PREFIX@@/bin/ar
++RANLIB   := @@PREFIX@@/bin/ranlib
++STRIP    := @@PREFIX@@/bin/strip
++LIPO     := @@PREFIX@@/bin/lipo
++DSYMUTIL := @@PREFIX@@/bin/dsymutil
+ 
+ Configs :=
+ UniversalArchs :=
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140303/baea7895/attachment.html>