From 6ecc6f252d81d951a01846c87a48fea33f37bf57 Mon Sep 17 00:00:00 2001
From: ths <ths>
Date: Sun, 18 Nov 2007 22:34:46 +0000
Subject: [PATCH] Solaris build fixes, based on a patch by Ben Taylor.

---
 Makefile.target | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index e4cad8747f..cc29d526fc 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -140,15 +140,15 @@ endif
 endif
 
 ifeq ($(ARCH),x86_64)
-BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
+  ifneq ($(CONFIG_SOLARIS),yes)
+    BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
+  endif
 endif
 
 ifeq ($(ARCH),ppc)
 CPPFLAGS+= -D__powerpc__
-ifdef CONFIG_LINUX_USER
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
 endif
-endif
 
 ifeq ($(ARCH),s390)
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
@@ -554,6 +554,13 @@ ifeq ($(ARCH),sparc64)
   endif
 endif
 
+ifeq ($(ARCH),x86_64)
+  VL_LDFLAGS+=-m64
+  ifneq ($(CONFIG_SOLARIS),yes)
+    VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
+  endif
+endif
+
 ifdef CONFIG_WIN32
 SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
 endif
-- 
2.11.4.GIT