[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.
This commit is contained in:
Colin Finck 2019-08-18 16:00:25 +02:00
parent 05a7fa2395
commit b1e2dad373
No known key found for this signature in database
GPG Key ID: 1BA74E70456BA1A9
2 changed files with 8 additions and 14 deletions

View File

@ -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"

View File

@ -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"