[70123] branches/release_1_9/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 70123
          http://trac.macports.org/changeset/70123
Author:   jmr at macports.org
Date:     2010-07-29 23:42:45 -0700 (Thu, 29 Jul 2010)
Log Message:
-----------
merge r67717 from trunk:
 use full path to default compiler in selfupdate (#23095)

Revision Links:
--------------
    http://trac.macports.org/changeset/67717

Modified Paths:
--------------
    branches/release_1_9/base/src/macports1.0/macports.tcl

Modified: branches/release_1_9/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_9/base/src/macports1.0/macports.tcl	2010-07-30 06:32:18 UTC (rev 70122)
+++ branches/release_1_9/base/src/macports1.0/macports.tcl	2010-07-30 06:42:45 UTC (rev 70123)
@@ -2740,9 +2740,16 @@
                 ui_warn "Disabling readline support due to readline in /usr/local"
             }
 
+            set cc_arg ""
+            switch -glob -- $::macports::macosx_version {
+                10.{4,5} { 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 " }
+            }
+
             # 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"
-            if { [catch { system "cd $mp_source_path && ./configure $configure_args && make && make install" } result] } {
+            if { [catch { system "cd $mp_source_path && ${cc_arg}./configure $configure_args && make && make install" } result] } {
                 return -code error "Error installing new MacPorts base: $result"
             }
             if {[info exists updatestatus]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100729/7065aae4/attachment.html>