<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[126356] trunk/base/src/port1.0/portconfigure.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/126356">126356</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-10-08 10:32:15 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>portconfigure.tcl: Trace cxx_stdlib</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portconfiguretcl">trunk/base/src/port1.0/portconfigure.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portconfiguretcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portconfigure.tcl (126355 => 126356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portconfigure.tcl 2014-10-08 17:32:13 UTC (rev 126355)
+++ trunk/base/src/port1.0/portconfigure.tcl 2014-10-08 17:32:15 UTC (rev 126356)
</span><span class="lines">@@ -58,7 +58,8 @@
</span><span class="cx"> default configure.cxx {[portconfigure::configure_get_compiler cxx]}
</span><span class="cx"> default configure.cxx_archflags {[portconfigure::configure_get_archflags cxx]}
</span><span class="cx"> default configure.cxx_stdlib {$cxx_stdlib}
</span><del>-default configure.cxxflags {${configure.optflags}}
</del><ins>+default configure.cxxflags \
+ {[portconfigure::construct_cxxflags ${configure.optflags}]}
</ins><span class="cx"> default configure.objcxx {[portconfigure::configure_get_compiler objcxx]}
</span><span class="cx"> default configure.objcxx_archflags {[portconfigure::configure_get_archflags objcxx]}
</span><span class="cx"> # No current reason for OBJCXXFLAGS to differ from CXXFLAGS.
</span><span class="lines">@@ -66,6 +67,33 @@
</span><span class="cx"> default configure.universal_cxxflags {[portconfigure::configure_get_universal_cflags]}
</span><span class="cx"> default configure.universal_objcxxflags {${configure.universal_cxxflags}}
</span><span class="cx">
</span><ins>+# Don't let Portfiles trash "-stdlib"; if they want to remove it, they
+# should clear configure.cxx_stdlib.
+option_proc configure.cxxflags portconfigure::stdlib_trace
+option_proc configure.objcxxflags portconfigure::stdlib_trace
+
+proc portconfigure::should_add_stdlib {} {
+ set has_stdlib [expr {[option configure.cxx_stdlib] ne ""}]
+ set is_clang [string match *clang* [option configure.cxx]]
+ return [expr {$has_stdlib && $is_clang}]
+}
+proc portconfigure::construct_cxxflags args {
+ if {[portconfigure::should_add_stdlib]} {
+ lappend args -stdlib=[option configure.cxx_stdlib]
+ }
+ 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]
+ return
+}
+
</ins><span class="cx"> # *****************************************
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -759,12 +787,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # Add flags to specify C++ STL implementation
- if {${configure.cxx_stdlib} ne "" && [string match "*clang*" [option configure.cxx]]} {
- append_to_environment_value configure CXXFLAGS -stdlib=${configure.cxx_stdlib}
- append_to_environment_value configure OBJCXXFLAGS -stdlib=${configure.cxx_stdlib}
- }
-
</del><span class="cx"> # Execute the command (with the new environment).
</span><span class="cx"> if {[catch {command_exec configure} result]} {
</span><span class="cx"> global configure.dir
</span></span></pre>
</div>
</div>
</body>
</html>