From d393f1923f1efa8ddef2079bab6e8c95def64d64 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sat, 3 Apr 2021 22:18:15 +0200
Subject: [PATCH] Fix spillover of host-specific build flags into the shared
 part of DYNAMIC_ARCH builds with gmake

for #3139
---
 Makefile.x86_64 | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile.x86_64 b/Makefile.x86_64
index 5406494..7f5f8d0 100644
--- a/Makefile.x86_64
+++ b/Makefile.x86_64
@@ -8,6 +8,20 @@ endif
 endif
 endif
 
+
+ifndef DYNAMIC_ARCH
+define ADD_CPUFLAGS
+1
+endef
+else
+ifdef TARGET_CORE
+define ADD_CPUFLAGS
+1
+endef
+endif
+endif
+
+ifdef ADD_CPUFLAGS
 ifdef HAVE_SSE3
 CCOMMON_OPT += -msse3
 ifneq ($(F_COMPILER), NAG)
@@ -44,7 +58,6 @@ endif
 endif
 
 ifeq ($(CORE), SKYLAKEX)
-ifndef DYNAMIC_ARCH
 ifndef NO_AVX512
 CCOMMON_OPT += -march=skylake-avx512
 ifneq ($(F_COMPILER), NAG)
@@ -62,10 +75,8 @@ endif
 endif
 endif
 endif
-endif
 
 ifeq ($(CORE), COOPERLAKE)
-ifndef DYNAMIC_ARCH
 ifndef NO_AVX512
 ifeq ($(C_COMPILER), GCC)
 # cooperlake support was added in 10.1
@@ -88,7 +99,6 @@ endif
 endif
 endif
 endif
-endif
 
 ifdef HAVE_AVX2
 ifndef NO_AVX2
@@ -120,6 +130,7 @@ endif
 endif
 endif
 
+endif
 
 
 ifeq ($(OSNAME), Interix)
-- 
2.7.4