From 1d325927d70029ee11c3be1c6f8c214c17401853 Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Fri, 2 Sep 2022 01:08:19 +0200
Subject: [PATCH] build: Remove unneeded libgcc files in make dist

---
 GNUmakefile.in | 10 ++++++++++
 bootstrap      | 15 +--------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 7b0a8ca3..710c2ef0 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -220,6 +220,16 @@ dist:
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestanding-headers/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries/.gitignore"
+
+	libgcc_needed="i686 x86_64-no-red-zone aarch64"; \
+	for f in $$libgcc_needed; do \
+		mv '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries/libgcc-$$f.a" '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries/libgcc-$$f.a.save"; \
+	done; \
+	rm '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries"/*.a; \
+	for f in $$libgcc_needed; do \
+		mv '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries/libgcc-$$f.a.save" '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/libgcc-binaries/libgcc-$$f.a"; \
+	done
+
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.git"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.gitignore"
 	rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/cross-detect/.git"
diff --git a/bootstrap b/bootstrap
index ceb61f9d..2376e6f6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -10,20 +10,7 @@ cd "$srcdir"
 [ -d cross-detect ] || git clone https://github.com/mintsuki/cross-detect.git
 [ -d freestanding-headers ] || git clone https://github.com/mintsuki/freestanding-headers.git
 [ -d limine-efi ] || git clone https://github.com/limine-bootloader/limine-efi.git
-
-if ! [ -d libgcc-binaries ]; then
-    git clone https://github.com/mintsuki/libgcc-binaries.git
-
-    # Remove the libgcc files we don't need
-    libgcc_needed="i686 x86_64-no-red-zone aarch64"
-    for f in $libgcc_needed; do
-        mv libgcc-binaries/libgcc-$f.a libgcc-binaries/libgcc-$f.a.save
-    done
-    rm libgcc-binaries/*.a
-    for f in $libgcc_needed; do
-        mv libgcc-binaries/libgcc-$f.a.save libgcc-binaries/libgcc-$f.a
-    done
-fi
+[ -d libgcc-binaries ] || git clone https://github.com/mintsuki/libgcc-binaries.git
 
 automake_libdir="$(automake --print-libdir)"