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

[jmr at macports.org]

Revision: 55933
          http://trac.macports.org/changeset/55933
Author:   jmr at macports.org
Date:     2009-08-21 08:29:12 -0700 (Fri, 21 Aug 2009)
Log Message:
-----------
in proc platform, set the variant using the actual name that was just defined

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

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-08-21 15:21:47 UTC (rev 55932)
+++ trunk/base/src/port1.0/portutil.tcl	2009-08-21 15:29:12 UTC (rev 55933)
@@ -696,26 +696,10 @@
     variant $platform $code
 
     # Set the variant if this platform matches the platform we're on
-    set matches 1
-    if {[info exists os.platform] && ${os.platform} == $os} {
-        set sel_platform $os
-        if {[info exists os.major] && [info exists release]} {
-            if {${os.major} == $release } {
-                set sel_platform ${sel_platform}_${release}
-            } else {
-                set matches 0
-            }
-        }
-        if {$matches == 1 && [info exists arch] && [info exists os.arch]} {
-            if {${os.arch} == $arch} {
-                set sel_platform ${sel_platform}_${arch}
-            } else {
-                set matches 0
-            }
-        }
-        if {$matches == 1} {
-            variant_set $sel_platform
-        }
+    if {([info exists os.platform] && ${os.platform} == $os)
+            && !([info exists os.major] && [info exists release] && ${os.major} != $release)
+            && !([info exists arch] && [info exists os.arch] && ${os.arch} != $arch)} {
+        variant_set $platform
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090821/f26c0cb8/attachment.html>