Bump macOS test to GCC version 14

hfp · May 31, 2024 · cc44763 · cc44763
1 parent 0a4d1b2
commit cc44763
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/arch/Darwin-gnu-arm64.psmp b/arch/Darwin-gnu-arm64.psmp
@@ -3,7 +3,7 @@
 # CP2K Darwin arch file for a parallel arm64 binary
 # (https://www.cp2k.org/howto:compile_on_macos)
 #
-# Tested with: GNU 13.2.0, OpenMPI 4.1.5,,
+# Tested with: GNU 14.1.0, OpenMPI 4.1.6,,
 #              ScaLAPACK 2.2.1, OpenBLAS 0.3.27,
 #              FFTW 3.3.10, HDF5 1.14.3,
 #              LIBINT 2.6.0, LIBXC 6.2.2,
@@ -12,13 +12,13 @@
 #              COSMA 2.6.6, SIRIUS 7.5.2,
 #              LIBGRPP 20231215,
 #              SPFFT 1.0.6, SPLA 1.5.5
-# on an Apple M1 (macOS 14.4.1 Sonoma)
+# on an Apple M1 (macOS 14.5.0 Sonoma)
 #
 # Usage: Source this arch file and then run make as instructed.
 #        Ensure the links in /opt/homebrew/bin to the gcc version
 #        and "brew unlink openmpi" (or mpich) if installed.
 #
-# Last update: 10.05.2024
+# Last update: 31.05.2024
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -35,7 +35,7 @@
       brew install cmake; \
       brew install coreutils; \
       brew install fftw; \
-      brew install gcc@13; \
+      brew install gcc; \
       brew install gsed; \
       brew install gsl; \
       brew install hdf5; \

diff --git a/tools/toolchain/scripts/stage4/install_scalapack.sh b/tools/toolchain/scripts/stage4/install_scalapack.sh
@@ -45,13 +45,16 @@ case "$with_scalapack" in
       mkdir -p "scalapack-${scalapack_ver}/build"
       pushd "scalapack-${scalapack_ver}/build" > /dev/null
 
-      flags=""
+      cflags=""
+      fflags=""
       if ("${FC}" --version | grep -q 'GNU'); then
-        flags=$(allowed_gfortran_flags "-fallow-argument-mismatch")
+        cflags="-fpermissive"
+        fflags=$(allowed_gfortran_flags "-fallow-argument-mismatch")
       fi
-      FFLAGS=$flags cmake -DCMAKE_FIND_ROOT_PATH="$ROOTDIR" \
+      CFLAGS=${cflags} FFLAGS=${fflags} cmake -DCMAKE_FIND_ROOT_PATH="$ROOTDIR" \
         -DCMAKE_INSTALL_PREFIX="${pkg_install_dir}" \
         -DCMAKE_INSTALL_LIBDIR="lib" \
+        -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DBUILD_SHARED_LIBS=NO \
         -DCMAKE_BUILD_TYPE=Release .. \
         -DBUILD_TESTING=NO \

diff --git a/tools/toolchain/scripts/stage7/install_libvdwxc.sh b/tools/toolchain/scripts/stage7/install_libvdwxc.sh
@@ -53,7 +53,7 @@ case "$with_libvdwxc" in
       if [ "${MPI_MODE}" = "no" ]; then
         # compile libvdwxc without mpi support since fftw (or mkl) do not have mpi support activated
         ./configure \
-          CC="${CC}" \
+          CC="${CC}" CFLAGS="${CFLAGS} -fpermissive" \
           FC="${FC}" \
           FFTW3_INCLUDES="${FFTW3_INCLUDES}" \
           FFTW3_LIBS="$(resolve_string "${FFTW3_LIBS}" "MPI")" \
@@ -63,7 +63,7 @@ case "$with_libvdwxc" in
           > configure.log 2>&1 || tail -n ${LOG_LINES} configure.log
       else
         ./configure \
-          CC="${MPICC}" \
+          CC="${MPICC}" CFLAGS="${CFLAGS} -fpermissive" \
           FC="${MPIFC}" \
           FFTW3_INCLUDES="${FFTW3_INCLUDES}" \
           FFTW3_LIBS="$(resolve_string "${FFTW3_LIBS}" "MPI")" \