[36907] trunk/base/src/port1.0/portutil.tcl

[nox at macports.org]

Revision: 36907
          http://trac.macosforge.org/projects/macports/changeset/36907
Author:   nox at macports.org
Date:     2008-05-18 05:00:46 -0700 (Sun, 18 May 2008)

Log Message:
-----------
merge procedure now uses configure.universal_archs

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

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2008-05-18 09:27:29 UTC (rev 36906)
+++ trunk/base/src/port1.0/portutil.tcl	2008-05-18 12:00:46 UTC (rev 36907)
@@ -2098,12 +2098,12 @@
 # 'base' is the path where the different directories (one for each arch) are
 # e.g. call 'merge ${workpath}/pre-dest' with having a destroot in ${workpath}/pre-dest/i386 and ${workpath}/pre-dest/ppc64 -- single arch -- each
 proc merge {base} {
-    global destroot
+    global destroot configure.universal_archs
 
     # test which architectures are available, set one as base-architecture
     set archs ""
     set base_arch ""
-    foreach arch {"i386" "x86_64" "ppc" "ppc64"} {
+    foreach arch ${configure.universal_archs} {
         if [file exists "${base}/${arch}"] {
             set archs [concat ${archs} ${arch}]
             set base_arch ${arch}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080518/2ab2b4d1/attachment.htm