Ensure build scripts are aware of new EESSI-extend behaviour

Author: ocaisa

EESSI-extend-easybuild.eb

@@ -38,7 +38,7 @@ description = """
 
  Strict installation path checking is enforced by EESSI for EESSI and site
  installations involving accelerators. In these cases, if you wish to create an
- accelerator installation you must set the environement variable
+ accelerator installation you must set the environment variable
  EESSI_ACCELERATOR_INSTALL (and load/reload this module).
 """
 

EESSI-install-software.sh

@@ -285,7 +285,12 @@ if [[ ! -z ${EESSI_DEV_PROJECT} ]]; then
 fi
 
 # If we have EESSI_ACCELERATOR_TARGET_OVERRIDE set (and non-empty), then this implies building for a GPU target
-if [[ -n "$EESSI_ACCELERATOR_TARGET_OVERRIDE" ]]; then
+# (this must be set _before_ we load EESSI-extend).
+# We also make sure that EESSI_ACCELERATOR_TARGET is also set as EESSI_ACCELERATOR_TARGET_OVERRIDE must
+# be set before the EESSI module is loaded in order to set accelerator information.
+if [[ -n "$EESSI_ACCELERATOR_TARGET_OVERRIDE" && -z "$EESSI_ACCELERATOR_TARGET" ]]; then
+  fatal_error "EESSI module should've set EESSI_ACCELERATOR_TARGET when EESSI_ACCELERATOR_TARGET_OVERRIDE exported." >&2
+elif [[ -n "$EESSI_ACCELERATOR_TARGET_OVERRIDE" ]]; then
   export EESSI_ACCELERATOR_INSTALL=1
 fi