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

[jmr at macports.org]

Revision: 53219
          http://trac.macports.org/changeset/53219
Author:   jmr at macports.org
Date:     2009-07-01 02:01:46 -0700 (Wed, 01 Jul 2009)
Log Message:
-----------
make sure build_arch exists on non-darwin

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-07-01 08:53:14 UTC (rev 53218)
+++ trunk/base/src/macports1.0/macports.tcl	2009-07-01 09:01:46 UTC (rev 53219)
@@ -659,19 +659,23 @@
     }
     
     # Default arch to build for
-    if {![info exists macports::build_arch] && $tcl_platform(os) == "Darwin"} {
-        if {[lindex [split $tcl_platform(osVersion) .] 0] >= 10} {
-            if {[sysctl hw.cpu64bit_capable] == 1} {
-                set macports::build_arch x86_64
+    if {![info exists macports::build_arch]} {
+        if {$tcl_platform(os) == "Darwin"} {
+            if {[lindex [split $tcl_platform(osVersion) .] 0] >= 10} {
+                if {[sysctl hw.cpu64bit_capable] == 1} {
+                    set macports::build_arch x86_64
+                } else {
+                    set macports::build_arch i386
+                }
             } else {
-                set macports::build_arch i386
+                if {$tcl_platform(machine) == "Power Macintosh"} {
+                    set macports::build_arch ppc
+                } else {
+                    set macports::build_arch i386
+                }
             }
         } else {
-            if {$tcl_platform(machine) == "Power Macintosh"} {
-                set macports::build_arch ppc
-            } else {
-                set macports::build_arch i386
-            }
+            set macports::build_arch ""
         }
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090701/42e03b6e/attachment.html>