From a1667111d372fe55d359b5b1bea94faf1f42a55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Mon, 25 Apr 2022 18:40:14 +0200 Subject: [PATCH] Toolchain: Fix caching in install_elpa.sh --- .../toolchain/scripts/stage5/install_elpa.sh | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/toolchain/scripts/stage5/install_elpa.sh b/tools/toolchain/scripts/stage5/install_elpa.sh index 8b7eaae64f..058b77d6f3 100755 --- a/tools/toolchain/scripts/stage5/install_elpa.sh +++ b/tools/toolchain/scripts/stage5/install_elpa.sh @@ -47,6 +47,17 @@ case "$with_elpa" in echo "==================== Installing ELPA ====================" pkg_install_dir="${INSTALLDIR}/elpa-${elpa_ver}" install_lock_file="$pkg_install_dir/install_successful" + enable_openmp="yes" + + # specific settings needed on CRAY Linux Environment + if [ "$ENABLE_CRAY" = "__TRUE__" ]; then + if [ ${CRAY_PRGENVCRAY} ]; then + # extra LDFLAGS needed + cray_ldflags="-dynamic" + fi + enable_openmp="no" + fi + if verify_checksums "${install_lock_file}"; then echo "elpa-${elpa_ver} is already installed, skipping it." else @@ -74,17 +85,6 @@ case "$with_elpa" in patch -p1 < "${patch}" done - enable_openmp="yes" - - # specific settings needed on CRAY Linux Environment - if [ "$ENABLE_CRAY" = "__TRUE__" ]; then - if [ ${CRAY_PRGENVCRAY} ]; then - # extra LDFLAGS needed - cray_ldflags="-dynamic" - fi - enable_openmp="no" - fi - # ELPA-2017xxxx enables AVX2 by default, switch off if machine doesn't support it. AVX_flag="" AVX512_flags=""