From 9bb9cc8896854f6a0a28f586f6025e8eb2623f0b Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 15 Jun 2019 15:42:13 -0400 Subject: [PATCH] build_cross_tools_gcc4: Remove the generated static libstdc++. We always want to use the shared one from the syslibs package, never the shared one from this build. Part of #14842: after this change, the ICU build now fails with "cannot find libstdc++" instead of an invalid symbol. --- build/scripts/build_cross_tools_gcc4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index 92a97fa743..8f438a620f 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -299,6 +299,9 @@ esac # Only the ones from the source tree should be used. rm -rf "$installDir/$haikuMachine/sys-include" +# remove the static libstdc++, only the shared one should be used +rm -f "$installDir/$haikuMachine/lib/libstdc++.a" + # remove the sysroot dir rm -rf "$sysrootDir"