Ticket #30009: default_compiler_from_xcode.2.patch

src/port1.0/portconfigure.tcl

@@ -352 +352 @@
 
 # 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
+    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} {
+        return gcc-4.2
+    } else {
+        return gcc-4.0
     }
 }
 

src/macports1.0/macports.tcl

@@ -374 +374 @@
                         set macports::xcodeversion "3.2.6"
                     } 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} {
                         set macports::xcodeversion "3.0"
@@ -3026 +3025 @@
                 append configure_args " --with-unsupported-prefix"
             }
 
-            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 " }
-            }
+            # Choose a sane compiler
+            set cc_arg "CC=/usr/bin/cc"
 
             # do the actual configure, build and installation of new base
             ui_msg "Installing new MacPorts release in $prefix as $owner:$group; permissions $perms; Tcl-Package in $tclpackage\n"