Skip to content
Permalink
Browse files

Use old ABI if building ports with MP g++ on 10.4 & 10.5

This maintains compatibility with the system libstdc++ on these
platforms.

(cherry picked from commit fb72047)
  • Loading branch information
jmroot committed Apr 10, 2018
1 parent 47d2191 commit 60fdc382c94d2559dcfa08d5b49c98878db3f107
Showing with 7 additions and 0 deletions.
  1. +7 −0 src/port1.0/portconfigure.tcl
@@ -76,9 +76,16 @@ proc portconfigure::should_add_stdlib {} {
set is_clang [string match *clang* [option configure.cxx]]
return [expr {$has_stdlib && $is_clang}]
}
proc portconfigure::should_add_cxx_abi {} {
set is_oldos [expr {[option os.platform] eq "darwin" && [option os.major] < 10}]
set is_mp_gcc [string match *g++-mp-* [option configure.cxx]]
return [expr {$is_oldos && $is_mp_gcc}]
}
proc portconfigure::construct_cxxflags {flags} {
if {[portconfigure::should_add_stdlib]} {
lappend flags -stdlib=[option configure.cxx_stdlib]
} elseif {[portconfigure::should_add_cxx_abi]} {
lappend flags -D_GLIBCXX_USE_CXX11_ABI=0
}
return $flags
}

0 comments on commit 60fdc38

Please sign in to comment.
You can’t perform that action at this time.