hrev53195 adds 1 changeset to branch 'master'
old head: 6a2133b16696cd4095a1a842878d84a817db8722
new head: d511533a487fce70d2d555ecce7c5e702fa4cac8
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=d511533a487f+%5E6a2133b16696
----------------------------------------------------------------------------
d511533a487f: build_cross_tools_gcc4: Keep static libstdc++, but rename it.
The gcc_bootstrap recipe still needs it, it seems.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53195
Commit: d511533a487fce70d2d555ecce7c5e702fa4cac8
URL: https://git.haiku-os.org/haiku/commit/?id=d511533a487f
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Jun 17 00:30:53 2019 UTC
----------------------------------------------------------------------------
1 file changed, 4 insertions(+), 2 deletions(-)
build/scripts/build_cross_tools_gcc4 | 6 ++++--
----------------------------------------------------------------------------
diff --git a/build/scripts/build_cross_tools_gcc4
b/build/scripts/build_cross_tools_gcc4
index 8f438a620f..38fc304729 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -299,8 +299,10 @@ 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"
+# rename the static libstdc++ to prevent accidental usage
+# (it should be used by the bootstrap process only)
+mv "$installDir/$haikuMachine/lib/libstdc++.a" \
+ "$installDir/$haikuMachine/lib/libstdc++-static.a"
# remove the sysroot dir
rm -rf "$sysrootDir"