Changeset 80130

Timestamp:

07/04/11 20:56:34 (4 years ago)

Author:

jmr@…

Message:

merge r80088 from trunk:

choose default configure.compiler based on Xcode version (#30009)

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/macports1.0/macports.tcl (modified) (2 diffs)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/port1.0/portconfigure.tcl (modified) (1 diff)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/src/macports1.0/macports.tcl

@@ -375 +375 @@
                     } elseif {$devtoolscore_v >= 1204.0} {
                         set macports::xcodeversion "3.1.4"
-                    } elseif {$devtoolscore_v > 921.0} {
-                        # XXX find actual version corresponding to 3.1
+                    } elseif {$devtoolscore_v >= 1100.0} {
                         set macports::xcodeversion "3.1"
                     } elseif {$devtoolscore_v >= 921.0} {
@@ -3027 +3026 @@
             }
 
+            # Choose a sane compiler
             set cc_arg ""
-            switch -glob -- $::macports::macosx_version {
-                10.[45] { set cc_arg "CC=/usr/bin/gcc-4.0 " }
-                10.6     { set cc_arg "CC=/usr/bin/gcc-4.2 " }
-                10.*     { set cc_arg "CC=/usr/bin/llvm-gcc-4.2 " }
+            if {$::macports::os_platform == "darwin"} {
+                set cc_arg "CC=/usr/bin/cc "
             }
 

branches/release_2_0/base/src/port1.0/portconfigure.tcl

@@ -353 +353 @@
 # internal function to determine the default compiler
 proc portconfigure::configure_get_default_compiler {args} {
-    global macosx_deployment_target developer_dir
-    switch -exact ${macosx_deployment_target} {
-        "10.4"      -
-        "10.5"      {
-            if {![file executable /usr/bin/gcc-4.0]} {
-                if {[file executable /usr/bin/gcc-4.2]} {
-                    return gcc-4.2
-                } elseif {[file executable ${developer_dir}/usr/bin/llvm-gcc-4.2]} {
-                    return llvm-gcc-4.2
-                }
-            }
-            return gcc-4.0
-        }
-        "10.6"      {
-            if {![file executable /usr/bin/gcc-4.2] &&
-                [file executable ${developer_dir}/usr/bin/llvm-gcc-4.2]} {
-                return llvm-gcc-4.2
-            }
-            return gcc-4.2
-        }
-        "10.7"      { return llvm-gcc-4.2 }
-        default     { return gcc }
+    global xcodeversion macosx_deployment_target
+    if {$xcodeversion == "none" || $xcodeversion == ""} {
+        return gcc
+    } elseif {[rpm-vercomp $xcodeversion 4.0] >= 0} {
+        return llvm-gcc-4.2
+    } elseif {[rpm-vercomp $xcodeversion 3.2] >= 0 && $macosx_deployment_target != "10.4"} {
+        return gcc-4.2
+    } else {
+        return gcc-4.0
     }
 }