Merge branch 'master-minor-fix-to-build-script' into 'master'

Do not modify GAUDI_ROOT if it is already set, since this can break certain workflows.

See merge request atlas/athena!16604

Projects/Athena/build_env.sh

@@ -62,8 +62,10 @@ env_setup() {
 
     # Point to Gaudi:
     # Get platform from the GAUDI build - we're assuming here that there's only one platform installed.
-    platform=$(cd ${BUILDDIR}/install/GAUDI/${NICOS_PROJECT_VERSION}/InstallArea/;ls)
-    export GAUDI_ROOT=${BUILDDIR}/install/GAUDI/${NICOS_PROJECT_VERSION}/InstallArea/${platform}
+    if [ -z "${GAUDI_ROOT+1}" ]; then
+        platform=$(cd ${BUILDDIR}/install/GAUDI/${NICOS_PROJECT_VERSION}/InstallArea/;ls)
+        export GAUDI_ROOT=${BUILDDIR}/install/GAUDI/${NICOS_PROJECT_VERSION}/InstallArea/${platform}
+    fi
     echo "Taking Gaudi from: ${GAUDI_ROOT}"
 
     cd $startdir