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

[larryv at macports.org]

Revision: 116457
          https://trac.macports.org/changeset/116457
Author:   larryv at macports.org
Date:     2014-01-25 11:16:13 -0800 (Sat, 25 Jan 2014)
Log Message:
-----------
portconfigure.tcl: Fold list of compiler ports into compiler_port_name.

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

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2014-01-25 18:54:02 UTC (rev 116456)
+++ trunk/base/src/port1.0/portconfigure.tcl	2014-01-25 19:16:13 UTC (rev 116457)
@@ -378,17 +378,14 @@
     return [regexp {^gcc-4|llvm|apple|clang} $compiler]
 }
 
-# Mapping from compiler names to compiler ports, for private use by
-# compiler_port_name. Do not access directly.
-set portconfigure::valid_compiler_ports {
-    {^apple-gcc-(\d+)\.(\d+)$}                          {apple-gcc%s%s}
-    {^macports-clang-(\d+\.\d+)$}                       {clang-%s}
-    {^macports-dragonegg-(\d+\.\d+)(-gcc-\d+\.\d+)?$}   {dragonegg-%s%s}
-    {^macports-(llvm-)?gcc-(\d+)\.(\d+)$}               {%sgcc%s%s}
-}
-
 proc portconfigure::compiler_port_name {compiler} {
-    foreach {re fmt} $portconfigure::valid_compiler_ports {
+    set valid_compiler_ports {
+        {^apple-gcc-(\d+)\.(\d+)$}                          {apple-gcc%s%s}
+        {^macports-clang-(\d+\.\d+)$}                       {clang-%s}
+        {^macports-dragonegg-(\d+\.\d+)(-gcc-\d+\.\d+)?$}   {dragonegg-%s%s}
+        {^macports-(llvm-)?gcc-(\d+)\.(\d+)$}               {%sgcc%s%s}
+    }
+    foreach {re fmt} $valid_compiler_ports {
         if {[set matches [regexp -inline $re $compiler]] ne ""} {
             return [eval [linsert [lrange $matches 1 end] 0 format $fmt]]
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140125/113b95f2/attachment.html>