Default GCC build to make --disable-bootstrap

Replace install.sh/build.sh arguments -z/--disable-bootstrap
with -Z/--bootstrap.

Author: Damian Rouson

install.sh

@@ -169,7 +169,7 @@ info  "-U (--print-url):        ${arg_U}"
 info  "-v (--version):          ${arg_v}"
 info  "-V (--print-version):    ${arg_V}"
 info  "-y (--yes-to-all):       ${arg_y}"
-info  "-z (--disable-bootstrap):${arg_z}"
+info  "-Z (--bootstrap):        ${arg_Z}"
 }
 # This file is organized into three sections:
 # 1. Command-line argument and environment variable processing.

install.sh-usage

@@ -22,4 +22,4 @@
   -v --version                Print OpenCoarrays version number.
   -V --print-version [arg]    Print version number for specified package (Example: -V mpich).
   -y --yes-to-all             Build non-interactively by assuming affirmative user responses.
-  -z --disable-bootstrap      Disabling bootstrap build of GCC for speed when a recent GCC is already installed.
+  -Z --bootstrap              Enable bootstrap build for robustness when building the required GCC version with an old GCC version.

prerequisites/build.sh

@@ -103,15 +103,15 @@ info "-l (--list-packages):    ${arg_l} "
 info "-m (--with-cmake):       ${arg_m} "
 info "-M (--with-mpi):         ${arg_M} "
 info "-n (--no-color):         ${arg_n} "
-info "-p (--package):          ${arg_p}"
+info "-p (--package):          ${arg_p} "
 info "-P (--print-path):       ${arg_P} "
 info "-t (--with-tau):         ${arg_t} "
 info "-u (--from-url):         ${arg_u} "
 info "-U (--print-url):        ${arg_U} "
 info "-v (--version):          ${arg_v} "
 info "-V (--print-version):    ${arg_V} "
 info "-y (--yes-to-all):       ${arg_y} "
-info "-z (--disable-bootstrap):${arg_z} "
+info "-Z (--bootstrap):        ${arg_Z} "
 }
 
 if [[ -z "${arg_B}" ]]; then
@@ -148,8 +148,9 @@ if [[ ${arg_o:-} == "${__flag_present}" ]]; then
    exit 0
 fi
 
-# If -z or --disable-bootstrap was specified, disable bootstrap configure & build
-if [[ ${arg_z:-} == "${__flag_present}" ]]; then
+# If -Z or --bootstrap was specified, enable bootstrap configure & build
+if [[ ${arg_Z:-} != "${__flag_present}" ]]; then
+   info "Disabling bootstrap. If the gcc/g++/gfortran build fails, try './install.sh --bootstrap'."
    export bootstrap_configure="--disable-bootstrap"
    export bootstrap_build=""
 else

prerequisites/build.sh-usage

@@ -24,4 +24,4 @@
   -v --version                Print OpenCoarrays version number.
   -V --print-version [arg]    Print installation version for package specified in argument.
   -y --yes-to-all             Build non-interactively by assuming affirmative user responses.
-  -z --disable-bootstrap      Disabling bootstrap build of GCC for speed when a recent GCC is already installed.
+  -Z --bootstrap              Enable bootstrap build for robustness when building the required GCC version with an old GCC version.

prerequisites/install-functions/find_or_install.sh

@@ -599,9 +599,13 @@ find_or_install()
       yes_to_all="-y"
     fi
 
+    if [[ "${arg_Z}" == "${__flag_present}" ]]; then
+      bootstrap="-Z"
+    fi
+
     echo -e "$this_script: Downloading, building, and installing $package \n"
-    echo "$this_script: Build command: FC=$FC CC=$CC CXX=$CXX ./build.sh -p $package -i $package_install_prefix -j $num_threads ${yes_to_all:-}"
-    FC="$FC" CC="$CC" CXX="$CXX" ./build.sh -p "$package" -i "$package_install_prefix" -j "$num_threads" "${yes_to_all:-}"
+    echo "$this_script: Build command: FC=$FC CC=$CC CXX=$CXX ./build.sh -p $package -i $package_install_prefix -j $num_threads ${yes_to_all:-} ${bootstrap:-}"
+    FC="$FC" CC="$CC" CXX="$CXX" ./build.sh -p "$package" -i "$package_install_prefix" -j "$num_threads" "${yes_to_all:-}" "${bootstrap:-}"
 
     if [[ -x "$package_install_path/bin/$executable" ]]; then
       echo -e "$this_script: Installation successful.\n"