From be19dc5e54686fc148cd207d1571c60261df965d Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Mon, 16 Jun 2008 13:14:13 +0000
Subject: INTEGRATION: CWS hr51 (1.7.8); FILE MERGED 2008/06/06 14:36:04 hr
 1.7.8.1: #i88947#: Solaris 64 bit support

---
 basebmp/source/makefile.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk
index f80812f2ed85..86b166d35d1e 100644
--- a/basebmp/source/makefile.mk
+++ b/basebmp/source/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.7 $
+# $Revision: 1.8 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -57,6 +57,12 @@ CDEFS+= -DVIGRA_HAS_LONG_DOUBLE
 CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER -DVIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS
 .ENDIF
 
+# SunStudio 12, LP64 mode (-m64): three test cases of the unit tests fail 
+# if compiled with default -xalias_level (and optimization level -xO3)
+.IF "$(OS)$(CPU)"=="SOLARISU"
+CDEFS+=-xalias_level=compatible
+.ENDIF
+
 # --- Common ----------------------------------------------------------
 
 SLOFILES =	\
-- 
cgit v1.2.3