From b1e2dad37322cef5757c8d70fb27e127e0e44909 Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@reactos.org>
Date: Sun, 18 Aug 2019 16:00:25 +0200
Subject: [PATCH] [SETUPLIBRARY] Check the $rs_process_* variable only in
 rs_prepare_module and extract unconditionally in rs_extract_module.

This no longer requires an rs_process_* variable for GMP, MPC, and MPFR, which makes no sense anyway, because they are always needed for building GCC.
---
 RosBE-Unix/Base-i386/scripts/setuplibrary.sh         | 11 ++++-------
 RosBE-Windows/Buildtoolchain/scripts/setuplibrary.sh | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/RosBE-Unix/Base-i386/scripts/setuplibrary.sh b/RosBE-Unix/Base-i386/scripts/setuplibrary.sh
index 746b6fe..8fd4214 100644
--- a/RosBE-Unix/Base-i386/scripts/setuplibrary.sh
+++ b/RosBE-Unix/Base-i386/scripts/setuplibrary.sh
@@ -191,10 +191,6 @@ rs_extract_module()
 	local module=$1
 	local target_dir=$2
 
-	if ! `eval echo \\$rs_process_$module`; then
-		return 1
-	fi
-
 	cd "$target_dir"
 
 	echo -n "Extracting $module... "
@@ -249,12 +245,13 @@ rs_prepare_module()
 {
 	local module=$1
 
-	rm -rf "$rs_workdir/$module"
-
-	if ! rs_extract_module "$module" "$rs_workdir"; then
+	if ! `eval echo \\$rs_process_$module`; then
 		return 1
 	fi
 
+	rm -rf "$rs_workdir/$module"
+	rs_extract_module "$module"
+
 	rm -rf "$module-build"
 	mkdir "$module-build"
 	cd "$module-build"
diff --git a/RosBE-Windows/Buildtoolchain/scripts/setuplibrary.sh b/RosBE-Windows/Buildtoolchain/scripts/setuplibrary.sh
index 746b6fe..8fd4214 100644
--- a/RosBE-Windows/Buildtoolchain/scripts/setuplibrary.sh
+++ b/RosBE-Windows/Buildtoolchain/scripts/setuplibrary.sh
@@ -191,10 +191,6 @@ rs_extract_module()
 	local module=$1
 	local target_dir=$2
 
-	if ! `eval echo \\$rs_process_$module`; then
-		return 1
-	fi
-
 	cd "$target_dir"
 
 	echo -n "Extracting $module... "
@@ -249,12 +245,13 @@ rs_prepare_module()
 {
 	local module=$1
 
-	rm -rf "$rs_workdir/$module"
-
-	if ! rs_extract_module "$module" "$rs_workdir"; then
+	if ! `eval echo \\$rs_process_$module`; then
 		return 1
 	fi
 
+	rm -rf "$rs_workdir/$module"
+	rs_extract_module "$module"
+
 	rm -rf "$module-build"
 	mkdir "$module-build"
 	cd "$module-build"