From 5332cbae18174720aa9ea511f774d11975e7b4bb Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sun, 4 Apr 2021 23:12:17 +0200
Subject: [PATCH] Avoid adding host-specific cpuflags to the common part of
 DYNAMIC_ARCH builds

---
 Makefile.x86 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile.x86 b/Makefile.x86
index 0e27264..893379c 100644
--- a/Makefile.x86
+++ b/Makefile.x86
@@ -1,10 +1,21 @@
 # COMPILER_PREFIX = mingw32-
 
+ifndef DYNAMIC_ARCH
+ADD_CPUFLAGS = 1
+else
+ifdef TARGET_CORE
+ADD_CPUFLAGS = 1
+endif
+endif
+
+ifdef ADD_CPUFLAGS
 ifdef HAVE_SSE
 CCOMMON_OPT += -msse
+ifneq ($(F_COMPILER), NAG)
 FCOMMON_OPT += -msse
 endif
-
+endif
+endif
 
 ifeq ($(OSNAME), Interix)
 ARFLAGS		= -m x86
-- 
2.7.4