[90015] branches/release_2_0/base/src/port1.0/portconfigure.tcl

[jmr at macports.org]

Revision: 90015
          http://trac.macports.org/changeset/90015
Author:   jmr at macports.org
Date:     2012-02-19 10:52:44 -0800 (Sun, 19 Feb 2012)
Log Message:
-----------
2.0 branch: use llvm compilers in /usr/bin when possible

Modified Paths:
--------------
    branches/release_2_0/base/src/port1.0/portconfigure.tcl

Modified: branches/release_2_0/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_2_0/base/src/port1.0/portconfigure.tcl	2012-02-19 18:34:37 UTC (rev 90014)
+++ branches/release_2_0/base/src/port1.0/portconfigure.tcl	2012-02-19 18:52:44 UTC (rev 90015)
@@ -418,22 +418,27 @@
             }
         }
         llvm-gcc-4.2 {
+            global macosx_version
+            set llvm_prefix ""
+            if {$macosx_version == "10.5"} {
+                set llvm_prefix ${developer_dir}
+            }
             switch -exact ${type} {
-                cc   { set ret ${developer_dir}/usr/bin/llvm-gcc-4.2 }
-                objc { set ret ${developer_dir}/usr/bin/llvm-gcc-4.2 }
-                cxx  { set ret ${developer_dir}/usr/bin/llvm-g++-4.2 }
-                cpp  { set ret ${developer_dir}/usr/bin/llvm-cpp-4.2 }
+                cc   { set ret ${llvm_prefix}/usr/bin/llvm-gcc-4.2 }
+                objc { set ret ${llvm_prefix}/usr/bin/llvm-gcc-4.2 }
+                cxx  { set ret ${llvm_prefix}/usr/bin/llvm-g++-4.2 }
+                cpp  { set ret ${llvm_prefix}/usr/bin/llvm-cpp-4.2 }
             }
         }
         clang {
             switch -exact ${type} {
-                cc   { set ret ${developer_dir}/usr/bin/clang }
-                objc { set ret ${developer_dir}/usr/bin/clang }
+                cc   { set ret /usr/bin/clang }
+                objc { set ret /usr/bin/clang }
                 cxx  {
-                    if {[file executable ${developer_dir}/usr/bin/clang++]} {
-                        set ret ${developer_dir}/usr/bin/clang++
+                    if {[file executable /usr/bin/clang++]} {
+                        set ret /usr/bin/clang++
                     } else {
-                        set ret ${developer_dir}/usr/bin/llvm-g++-4.2
+                        set ret /usr/bin/llvm-g++-4.2
                     }
                 }
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120219/e4bb3211/attachment.html>