From 1b6f98637b5cbfb4108f16517f1c9549b7282e72 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 20 Dec 2009 16:46:27 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20by=20Andreas=20F=C3=83=C2=A4rber:=20Fix?=
 =?UTF-8?q?=20mixup=20of=20GNU=20and=20Sun=20linker=20on=20OpenSolaris.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34726 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/BuildSetup | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 145999e2a6..7c8ae46f60 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -516,6 +516,12 @@ if $(HOST_PLATFORM) = linux || $(HOST_PLATFORM) = freebsd
 	}
 }
 
+# TODO: Temporary work-around for mixup of GNU and Sun linker on OpenSolaris.
+# Should be moved to configure.
+if $(HOST_PLATFORM) = sunos && $(HOST_LD) = ld {
+	HOST_LD = /usr/ccs/bin/ld ;
+}
+
 if $(HOST_PLATFORM) = cygwin {
 	HOST_LINKFLAGS += -Xlinker --allow-multiple-definition -Xlinker
 		--enable-auto-import ;