Skip to content

Commit

Permalink
Use libstdc++.so in place of libsupc++.so.
Browse files Browse the repository at this point in the history
* The latter doesn't link against libroot.so, which lets the library init fail.
* Fix kernel_debugger crash in malloc().
* libsupc++.so will be deleted from gcc_syslibs package (the static libs will
stay however).
  • Loading branch information
korli committed Apr 25, 2016
1 parent 60ac535 commit 0cb870a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions build/jam/SystemLibraryRules
Expand Up @@ -57,13 +57,14 @@ rule TargetLibsupc++ asPath
# there is no libsupc++.so for the legacy compiler
return ;
}
# return libsupc++.so from the gcc_syslibs build feature.
# return libstdc++.so (which includes libsupc++) from the gcc_syslibs
# build feature.
local flags ;
if $(asPath) = true {
flags += path ;
}
return [
BuildFeatureAttribute gcc_syslibs : libsupc++.so : $(flags)
BuildFeatureAttribute gcc_syslibs : libstdc++.so : $(flags)
] ;
} else {
# TODO: return libsupc++.so for non-Haiku target platform if needed
Expand Down

0 comments on commit 0cb870a

Please sign in to comment.