diff --git a/arch/Darwin-gnu-arm64.psmp b/arch/Darwin-gnu-arm64.psmp index b1c763325f..6015a3a387 100644 --- a/arch/Darwin-gnu-arm64.psmp +++ b/arch/Darwin-gnu-arm64.psmp @@ -15,10 +15,10 @@ # on an Apple M1 (macOS 14.4.1 Sonoma) # # Usage: Source this arch file and then run make as instructed. -# Ensure the links in /usr/local/bin to the lastest gcc version +# Ensure the links in /opt/homebrew/bin to the gcc version # and "brew unlink openmpi" (or mpich) if installed. # -# Last update: 09.05.2024 +# Last update: 10.05.2024 # # \ if [[ "${0}" == "${BASH_SOURCE}" ]]; then \ diff --git a/arch/Darwin-gnu-arm64.ssmp b/arch/Darwin-gnu-arm64.ssmp index 52fc65c686..aca840e7f7 100644 --- a/arch/Darwin-gnu-arm64.ssmp +++ b/arch/Darwin-gnu-arm64.ssmp @@ -4,14 +4,14 @@ # (https://www.cp2k.org/howto:compile_on_macos) # # Tested with: GNU 13.2.0, FFTW 3.3.10, LIBINT 2.6.0, LIBVORI 220621, -# LIBXC 6.2.2, OpenBLAS 0.3.26, SPGLIB 2.3.1, +# LIBXC 6.2.2, OpenBLAS 0.3.27, SPGLIB 2.3.1, # LIBGRPP 20231215 -# on an Apple M1 (macOS 14.2.1 Sonoma) +# on an Apple M1 (macOS 14.4.1 Sonoma) # # Usage: Source this arch file and then run make as instructed. -# Ensure the links in /usr/local/bin to the lastest gcc version. +# Ensure the links in /opt/homebrew/bin to the gcc version. # -# Last update: 19.03.2024 +# Last update: 10.05.2024 # # \ if [[ "${0}" == "${BASH_SOURCE}" ]]; then \ @@ -26,7 +26,7 @@ brew install cmake; \ brew install coreutils; \ brew install fftw; \ - brew install gcc; \ + brew install gcc@13; \ brew install libxc; \ brew install openblas; \ brew install pkg-config; \ @@ -170,7 +170,7 @@ FCFLAGS += -ffree-line-length-none FCFLAGS += -fno-omit-frame-pointer FCFLAGS += -std=f2008 -LDFLAGS += $(FCFLAGS) +LDFLAGS += $(FCFLAGS) -ld_classic LIBS += -ldl -lstdc++ diff --git a/tools/toolchain/scripts/stage7/install_libvdwxc.sh b/tools/toolchain/scripts/stage7/install_libvdwxc.sh index 514e3b849a..1e4e7e203d 100755 --- a/tools/toolchain/scripts/stage7/install_libvdwxc.sh +++ b/tools/toolchain/scripts/stage7/install_libvdwxc.sh @@ -46,7 +46,7 @@ case "$with_libvdwxc" in tar -xzf libvdwxc-${libvdwxc_ver}.tar.gz cd libvdwxc-${libvdwxc_ver} - if [ "${OPENBLAS_ARCH}" = "arm64" ]; then + if [ "$(uname -s)" = "Darwin" ]; then LDFLAGS="${LDFLAGS} -ld_classic" fi