[34362] trunk/base/src/port1.0/portconfigure.tcl

afb at macports.org afb at macports.org
Fri Feb 22 03:08:41 PST 2008


Revision: 34362
          http://trac.macosforge.org/projects/macports/changeset/34362
Author:   afb at macports.org
Date:     2008-02-22 03:08:22 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
don't hardcode arch, when doing cross-compile

Modified Paths:
--------------
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2008-02-22 10:54:17 UTC (rev 34361)
+++ trunk/base/src/port1.0/portconfigure.tcl	2008-02-22 11:08:22 UTC (rev 34362)
@@ -144,7 +144,14 @@
 
 # internal function to determine canonical system name for configure
 proc configure_get_universal_system_name {args} {
-    global configure.universal_target
+    global configure.universal_target configure.universal_archs
+    set arch "unknown"
+    switch -- ${configure.universal_archs} {
+        "ppc"  { set arch "powerpc" }
+        "i386"  { set arch "i686" }
+        "ppc64"  { set arch "powerpc" }
+        "x86_64"  { set arch "i686" }
+    }
     switch -- ${configure.universal_target} {
         "10.1"  { return "powerpc-apple-darwin5" }
                 # /Developer/SDKs/MacOSX10.1.5.sdk
@@ -152,8 +159,8 @@
                 # /Developer/SDKs/MacOSX10.2.8.sdk
         "10.3"  { return "powerpc-apple-darwin7" }
                 # /Developer/SDKs/MacOSX10.3.9.sdk
-        "10.4"  { return "i686-apple-darwin8" }
-        "10.5"  { return "i686-apple-darwin9" }
+        "10.4"  { return "${arch}-apple-darwin8" }
+        "10.5"  { return "${arch}-apple-darwin9" }
     }
     return ""
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080222/25e2adeb/attachment.html 


More information about the macports-changes mailing list