[49176] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[mcalhoun at macports.org]

Revision: 49176
          http://trac.macports.org/changeset/49176
Author:   mcalhoun at macports.org
Date:     2009-04-04 16:16:55 -0700 (Sat, 04 Apr 2009)
Log Message:
-----------
muniversal: Reverse part of r49158.
See http://permalink.gmane.org/gmane.os.apple.macports.devel/7971 for the reasons.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-04-04 22:53:16 UTC (rev 49175)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-04-04 23:16:55 UTC (rev 49176)
@@ -61,7 +61,19 @@
 }
 
 proc muniversal_get_arch_flag {arch} {
-    return "-arch ${arch}"
+    global os.arch 
+    # Prefer -m to -arch 
+    set archf "-arch ${arch}" 
+    if { ${os.arch}=="i386" && ${arch}=="i386" } { 
+        set archf -m32 
+    } elseif { ${os.arch}=="i386" && ${arch}=="x86_64" } { 
+        set archf -m64 
+    } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc" } { 
+        set archf -m32 
+    } elseif { ${os.arch}=="powerpc" && ${arch}=="ppc64" } { 
+        set archf -m64 
+    } 
+    return ${archf}
 }
 
 if { ! [info exists merger_arch_flag ] } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090404/1c9519b5/attachment.html>