Changeset 79944

Timestamp:

06/29/11 19:39:29 (4 years ago)

Author:

jmr@…

Message:

merge r79943 from trunk:

add fallbacks for default configure.compiler when targeting older OS versions and using newer dev tools

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• 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/port1.0/portconfigure.tcl

@@ -353 +353 @@
 # internal function to determine the default compiler
 proc portconfigure::configure_get_default_compiler {args} {
-    global macosx_deployment_target
+    global macosx_deployment_target developer_dir
     switch -exact ${macosx_deployment_target} {
         "10.4"      -
-        "10.5"      { return gcc-4.0 }
-        "10.6"      { return gcc-4.2 }
+        "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 }