From 1ddaa21f25dd09d44a49a7407480072f251f8333 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 30 Dec 2008 13:48:34 +0000
Subject: CWS-TOOLING: integrate CWS hr58 2008-12-29 16:47:08 +0100 hr  r265821
 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (x86)
 2008-12-18 16:16:11 +0100 hr  r265701 : #i97331#: revert to revision r265576
 2008-12-18 16:00:41 +0100 hr  r265699 : #i97331#: fix typo in last change
 2008-12-17 18:16:18 +0100 hr  r265653 : #i97331#: add comment 2008-12-17
 18:11:11 +0100 hr  r265652 : #i97331#: make -xc99=all again dependend on
 SYSBASEROOT being set 2008-12-17 01:54:23 +0100 hr  r265576 : #i97331#:
 changes for compiling with SunStudio12 on Solaris 10 (Sparc)

---
 icu/makefile.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'icu')

diff --git a/icu/makefile.mk b/icu/makefile.mk
index f363155780b5..5a1a1d258f63 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -65,7 +65,10 @@ icu_CFLAGS+=-I$(SYSBASE)$/usr$/include
 .IF "$(COMNAME)"=="sunpro5"
 icu_CFLAGS+=$(C_RESTRICTIONFLAGS)
 .ENDIF			# "$(COMNAME)"=="sunpro5"
-icu_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
+# add SYSBASE libraries and make certain that they are found *after* the 
+# icu build internal libraries - in case that icu is available in SYSBASE
+# as well
+icu_LDFLAGS+= -L../../lib -L../../stubdata  -L$(SYSBASE)$/usr$/lib
 .ENDIF			# "$(SYSBASE)"!=""
 
 .IF "$(OS)"=="MACOSX"
-- 
cgit