From 48e41e6921d8817afe9bd6a79f476f34957fbc60 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 25 Feb 2015 13:35:33 -0600
Subject: m68k specific LDFLAGS

---
 mk/vars.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk/vars.mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index ec5d89fdb..ba4a29924 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -124,6 +124,7 @@ TARGET_CFLAGS+=		-march=$(ADK_TARGET_GCC_ARCH)
 TARGET_CXXFLAGS+=	-march=$(ADK_TARGET_GCC_ARCH)
 endif
 
+<<<<<<< HEAD
 ifneq ($(ADK_TARGET_CPU_FLAGS),)
 TARGET_CFLAGS+=		$(ADK_TARGET_CPU_FLAGS)
 TARGET_CXXFLAGS+=	$(ADK_TARGET_CPU_FLAGS)
@@ -145,11 +146,10 @@ TARGET_CXXFLAGS+=	-m$(ADK_TARGET_FLOAT)-float
 endif
 endif
 
+ifeq ($(ADK_TARGET_ARCH_M68K),y)
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
 TARGET_LDFLAGS+=	-elf2flt
 endif
-
-ifeq ($(ADK_TARGET_ARCH_M68K),y)
 ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y)
 TARGET_CFLAGS+=		-msep-data
 TARGET_CXXFLAGS+=	-msep-data
-- 
cgit v1.2.3