<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/48ec1123ad66a71d2ca4c1fe5fe51e7f210dc363">https://github.com/macports/macports-base/commit/48ec1123ad66a71d2ca4c1fe5fe51e7f210dc363</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 48ec1123ad66a71d2ca4c1fe5fe51e7f210dc363
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Oct 9 19:39:49 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> Always allow macports-gcc if using libstdc++
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 42b36f4ae65e27b1824dd34c9fc23c022caa61e3)
</span>---
src/port1.0/portconfigure.tcl | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
<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 68bbe23..3602357 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;'>@@ -776,11 +776,9 @@ proc portconfigure::get_min_command_line {compiler} {
</span>
switch ${compiler} {
clang {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.cxx_stdlib] eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # no Xcode clang can build against libc++ on < 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.cxx_stdlib] eq "libc++" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no Xcode clang can build against libc++ on < 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return none
</span> }
if {${compiler.c_standard} >= 2011} {
set min_value [max_version $min_value 318.0.61]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -837,7 +835,11 @@ proc portconfigure::get_min_clang {} {
</span> proc portconfigure::get_min_gcc {} {
global compiler.c_standard compiler.cxx_standard compiler.openmp_version compiler.thread_local_storage
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option configure.cxx_stdlib] ne "" && [option configure.cxx_stdlib] ne "macports-libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Technically these only support macports-libstdc++, but if all the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # options that use the system libstdc++ have been blacklisted, we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # still need to use something. So only skip them entirely when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # using libc++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option configure.cxx_stdlib] eq "libc++"} {
</span> return none
}
</pre><pre style='margin:0'>
</pre>