[52397] trunk/base/src/macports1.0/macports.tcl

[toby at macports.org]

Revision: 52397
          http://trac.macports.org/changeset/52397
Author:   toby at macports.org
Date:     2009-06-15 13:27:29 -0700 (Mon, 15 Jun 2009)
Log Message:
-----------
fix fallback universal_archs

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-06-15 20:11:01 UTC (rev 52396)
+++ trunk/base/src/macports1.0/macports.tcl	2009-06-15 20:27:29 UTC (rev 52397)
@@ -319,7 +319,7 @@
         upvar $up_variations variations
     }
 
-    global auto_path env
+    global auto_path env tcl_platform
     global macports::autoconf::macports_conf_path
     global macports::macports_user_dir
     global macports::bootstrap_options
@@ -650,7 +650,11 @@
 
     # Default mp universal options
     if {![info exists macports::universal_archs]} {
-        set macports::universal_archs {ppc i386}
+        if {[lindex [split $tcl_platform(osVersion) .] 0] >= 10} {
+            set macports::universal_archs {x86_64 i386}
+        } else {
+            set macports::universal_archs {i386 ppc}
+        }
     }
 
     # ENV cleanup.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090615/2bf4d81f/attachment.html>