From 0cb870a56c793564afb021cfb4aaabba56296696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 25 Apr 2016 19:09:03 +0200 Subject: [PATCH] Use libstdc++.so in place of libsupc++.so. * 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). --- build/jam/SystemLibraryRules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/jam/SystemLibraryRules b/build/jam/SystemLibraryRules index 3ef5e90cddc..93b12e01fc3 100644 --- a/build/jam/SystemLibraryRules +++ b/build/jam/SystemLibraryRules @@ -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