fixes for cases where there are no compiler wrappers available

scripts/setup/build-dependencies.sh

@@ -2,7 +2,7 @@
 # More safety by turning some bugs into errors.
 # Without `errexit` you don’t need ! and can replace
 # ${PIPESTATUS[0]} with a simple $?, but I prefer safety.
-set -o errexit -o pipefail -o noclobber -o nounset
+set -o errexit -o pipefail -o noclobber
 
 REPO_TAG_AEC="v1.1.2"
 REPO_TAG_ECBUILD="3.8.0"

scripts/setup/lumi.cce-16.0.1.sh

@@ -34,11 +34,11 @@ INSTALL_PATH=$BUILD_PATH/install
 # build dependencies for yaco
 echo "=== Building yaco dependencies ==="
 echo $DEPENDENCY_TO_BUILD
-CC="${CC}" CXX="${CXX}" FC="${FC}" $ABSOLUTE_YACO_ROOT/scripts/setup/build-dependencies.sh -j $THREADS --dependency $DEPENDENCY_TO_BUILD --build_dir_name $COMPILER --prefix_path $INSTALL_PATH
+$ABSOLUTE_YACO_ROOT/scripts/setup/build-dependencies.sh -j $THREADS --dependency $DEPENDENCY_TO_BUILD --build_dir_name $COMPILER --prefix_path $INSTALL_PATH
 
 # build yaco
 echo "=== Building yaco ==="
 cd "$BUILD_PATH"
-CC="${CC}" CXX="${CXX}" FC="${FC}" cmake $ABSOLUTE_YACO_ROOT -DCMAKE_PREFIX_PATH=$INSTALL_PATH -DENABLE_NETCDF=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Release
+cmake $ABSOLUTE_YACO_ROOT -DCMAKE_PREFIX_PATH=$INSTALL_PATH -DENABLE_NETCDF=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Release
 cmake --build . -j $THREADS
 cmake --install . --prefix=$INSTALL_PATH

scripts/setup/lumi.cce-17.0.1.sh

@@ -34,11 +34,11 @@ INSTALL_PATH=$BUILD_PATH/install
 # build dependencies for yaco
 echo "=== Building yaco dependencies ==="
 echo $DEPENDENCY_TO_BUILD
-CC="${CC}" CXX="${CXX}" FC="${FC}" $ABSOLUTE_YACO_ROOT/scripts/setup/build-dependencies.sh -j $THREADS --dependency $DEPENDENCY_TO_BUILD --build_dir_name $COMPILER --prefix_path $INSTALL_PATH
+$ABSOLUTE_YACO_ROOT/scripts/setup/build-dependencies.sh -j $THREADS --dependency $DEPENDENCY_TO_BUILD --build_dir_name $COMPILER --prefix_path $INSTALL_PATH
 
 # build yaco
 echo "=== Building yaco ==="
 cd "$BUILD_PATH"
-CC="${CC}" CXX="${CXX}" FC="${FC}" cmake $ABSOLUTE_YACO_ROOT -DCMAKE_PREFIX_PATH=$INSTALL_PATH -DENABLE_NETCDF=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Release
+cmake $ABSOLUTE_YACO_ROOT -DCMAKE_PREFIX_PATH=$INSTALL_PATH -DENABLE_NETCDF=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Release
 cmake --build . -j $THREADS
 cmake --install . --prefix=$INSTALL_PATH