Fix build of static CP2K binary

cp2k · Jan 9, 2023 · 72f72f4 · 72f72f4
1 parent 0af815c
commit 72f72f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/arch/Linux-gnu-aarch64-static.ssmp b/arch/Linux-gnu-aarch64-static.ssmp
@@ -7,7 +7,7 @@
 #
 # Usage: Source this arch file and then run make as instructed.
 #
-# Author: Matthias Krack (15.12.2022)
+# Author: Matthias Krack (09.01.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \
@@ -140,7 +140,9 @@ endif
 CFLAGS         += $(DFLAGS) $(CFLAGS_DEBUG)
 
 FCFLAGS        := $(CFLAGS) $(FCFLAGS_DEBUG) $(WFLAGS)
-FCFLAGS        += -fallow-argument-mismatch
+ifeq ($(shell [ $(shell gcc -dumpversion | cut -d. -f1) -gt 9 ] && echo yes), yes)
+   FCFLAGS        += -fallow-argument-mismatch
+endif
 FCFLAGS        += -fbacktrace
 FCFLAGS        += -ffree-form
 FCFLAGS        += -ffree-line-length-none
@@ -154,6 +156,6 @@ else
    LDFLAGS        += $(FCFLAGS) -static
 endif
 
-LIBS           += -ldl -lstdc++
+LIBS           += -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -ldl -lstdc++
 
 # End
diff --git a/arch/Linux-gnu-x86_64-static.ssmp b/arch/Linux-gnu-x86_64-static.ssmp
@@ -7,7 +7,7 @@
 #
 # Usage: Source this arch file and then run make as instructed.
 #
-# Author: Matthias Krack (15.12.2022)
+# Author: Matthias Krack (09.01.2023)
 #
 # \
    if [[ "${0}" == "${BASH_SOURCE}" ]]; then \