<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/ebd226139d5ba8389367606761658ad0e3bb5cce">https://github.com/macports/macports-base/commit/ebd226139d5ba8389367606761658ad0e3bb5cce</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ebd226139 As of gcc 10, g++ supports setting the c++ runtime via -stdlib
</span>ebd226139 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ebd226139d5ba8389367606761658ad0e3bb5cce
</span>Author: Chris Jones <cjones051073@icloud.com>
AuthorDate: Fri Jan 7 13:33:27 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> As of gcc 10, g++ supports setting the c++ runtime via -stdlib
</span>---
src/port1.0/portconfigure.tcl | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d6748c517..963196cd1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,16 @@ option_proc configure.objcxxflags portconfigure::stdlib_trace
</span> proc portconfigure::should_add_stdlib {} {
set has_stdlib [expr {[option configure.cxx_stdlib] ne ""}]
set is_clang [string match *clang* [option configure.cxx]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return [expr {$has_stdlib && $is_clang}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # GCC also supports -stdlib starting with GCC 10 (and devel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set is_gcc_with_stdlib no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string match *g*-mp-* [option configure.cxx]] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract gcc version from value after last -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_ver [lindex [split [option configure.cxx] "-"] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${gcc_ver} eq "devel" || ${gcc_ver} >= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set is_gcc_with_stdlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [expr {$has_stdlib && ($is_clang || $is_gcc_with_stdlib)}]
</span> }
proc portconfigure::should_add_cxx_abi {} {
# prior to OS X Mavericks, libstdc++ was the default C++ runtime, so
</pre><pre style='margin:0'>
</pre>