[104071] trunk/dports/lang/rust

[larryv at macports.org]

Revision: 104071
          https://trac.macports.org/changeset/104071
Author:   larryv at macports.org
Date:     2013-03-14 12:19:20 -0700 (Thu, 14 Mar 2013)
Log Message:
-----------
rust: Pass correct compiler to bundled LLVM.

Modified Paths:
--------------
    trunk/dports/lang/rust/Portfile
    trunk/dports/lang/rust/files/patch-configure.diff

Modified: trunk/dports/lang/rust/Portfile
===================================================================
--- trunk/dports/lang/rust/Portfile	2013-03-14 19:11:48 UTC (rev 104070)
+++ trunk/dports/lang/rust/Portfile	2013-03-14 19:19:20 UTC (rev 104071)
@@ -95,10 +95,10 @@
 }
 
 # Using MacPorts' LLVM currently results in a stage2 compiler that
-# segfaults during the build (with llvm-3.2, at least); until we fix
-# this, we need Python. The weird dependency is to accommodate older
-# systems that only have Python 2.6; if we have to provide our own, we'd
-# rather install 2.7. The build itself will detect either.
+# segfaults during the build; until we fix this, we need Python. The
+# weird dependency is to accommodate older systems that only have Python
+# 2.6; if we have to provide our own, we'd rather install 2.7. The build
+# itself will detect either.
 depends_build           bin:perl:perl5 \
                         bin:python2.6:python27
 depends_skip_archcheck  python27

Modified: trunk/dports/lang/rust/files/patch-configure.diff
===================================================================
--- trunk/dports/lang/rust/files/patch-configure.diff	2013-03-14 19:11:48 UTC (rev 104070)
+++ trunk/dports/lang/rust/files/patch-configure.diff	2013-03-14 19:19:20 UTC (rev 104071)
@@ -1,5 +1,5 @@
 diff --git a/configure b/configure
-index f2afa2d..e6c859f 100755
+index f2afa2d..93a2106 100755
 --- a/configure
 +++ b/configure
 @@ -234,17 +234,7 @@ need_cmd sed
@@ -61,3 +61,28 @@
          step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
          CFG_C_COMPILER="clang"
          ;;
+@@ -727,20 +719,11 @@ do
+                    --enable-bindings=none --disable-threads \
+                    --disable-pthreads"
+ 
+-        if [ "$CFG_C_COMPILER" = "clang" ]
+-        then
+-            LLVM_CXX_32="clang++ -m32"
+-            LLVM_CC_32="clang -m32"
++        LLVM_CXX_32="$CXX -m32"
++        LLVM_CC_32="$CC -m32"
+ 
+-            LLVM_CXX_64="clang++"
+-            LLVM_CC_64="clang"
+-        else
+-            LLVM_CXX_32="g++ -m32"
+-            LLVM_CC_32="gcc -m32"
+-
+-            LLVM_CXX_64="g++"
+-            LLVM_CC_64="gcc"
+-        fi
++        LLVM_CXX_64="$CXX"
++        LLVM_CC_64="$CC"
+ 
+         LLVM_CFLAGS_32="-m32"
+         LLVM_CXXFLAGS_32="-m32"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130314/15426fa0/attachment.html>