From d511533a487fce70d2d555ecce7c5e702fa4cac8 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sun, 16 Jun 2019 20:30:53 -0400
Subject: [PATCH] build_cross_tools_gcc4: Keep static libstdc++, but rename it.

The gcc_bootstrap recipe still needs it, it seems.
---
 build/scripts/build_cross_tools_gcc4 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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"