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

[cal at macports.org]

Revision: 102937
          https://trac.macports.org/changeset/102937
Author:   cal at macports.org
Date:     2013-02-10 18:29:54 -0800 (Sun, 10 Feb 2013)
Log Message:
-----------
auto compiler dependencies: avoid duplicates, simplify

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

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2013-02-11 02:29:38 UTC (rev 102936)
+++ trunk/base/src/port1.0/portconfigure.tcl	2013-02-11 02:29:54 UTC (rev 102937)
@@ -772,16 +772,17 @@
     ui_debug "Chosen compiler ${compiler} is provided by a port, adding dependency"
 
     set compiler_port $compiler_name_map($compiler)
+    set deptype "build"
     if {[string first "macports-gcc-" $compiler] == 0} {
-        ui_debug "  Adding depends_lib port:$compiler_port"
-        depends_lib-append port:$compiler_port
-    } else {
-        ui_debug "  Adding depends_build port:$compiler_port"
-        depends_build-append port:$compiler_port
+        set deptype "lib"
     }
+    ui_debug "Adding depends_${deptype} port:$compiler_port"
+    depends_${deptype}-delete port:$compiler_port
+    depends_${deptype}-append port:$compiler_port
 
     if {[arch_flag_supported $compiler]} {
-        ui_debug "  Adding depends_skip_archcheck port:$compiler_port"
+        ui_debug "Adding depends_skip_archcheck port:$compiler_port"
+        depends_skip_archcheck-delete $compiler_port
         depends_skip_archcheck-append $compiler_port
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130210/64f5e4d3/attachment.html>