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

[larryv at macports.org]

Revision: 126358
          https://trac.macports.org/changeset/126358
Author:   larryv at macports.org
Date:     2014-10-08 11:23:45 -0700 (Wed, 08 Oct 2014)
Log Message:
-----------
portconfigure.tcl: Always sanitize cxxflags

Correctly handle the case where configure.cxx_stdlib is cleared after
configure.cxxflags is read.

This means that Portfile authors can't put "-stdlib" into
configure.cxxflags themselves, as it'll get scrubbed. They shouldn't be
doing this anyway.

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-10-08 17:32:17 UTC (rev 126357)
+++ trunk/base/src/port1.0/portconfigure.tcl	2014-10-08 18:23:45 UTC (rev 126358)
@@ -84,13 +84,12 @@
     return $args
 }
 proc portconfigure::stdlib_trace {opt action args} {
-    if {$action ne "read" || ![portconfigure::should_add_stdlib]} {
-        return
-    }
     foreach flag [lsearch -all -inline [option $opt] -stdlib=*] {
         $opt-delete $flag
     }
-    $opt-append -stdlib=[option configure.cxx_stdlib]
+    if {$action eq "read" && [portconfigure::should_add_stdlib]} {
+        $opt-append -stdlib=[option configure.cxx_stdlib]
+    }
     return
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141008/f17a239a/attachment.html>