From 0b3f346d173ae177ab2656b5e9953e5a310eebe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Tue, 28 Oct 2008 16:38:38 +0000
Subject: CWS-TOOLING: integrate CWS basebmpunittestfix

---
 basebmp/source/makefile.mk | 4 ++--
 basebmp/test/makefile.mk   | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'basebmp')

diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk
index 86b166d35d1e..658465523bfc 100644
--- a/basebmp/source/makefile.mk
+++ b/basebmp/source/makefile.mk
@@ -57,9 +57,9 @@ 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 
+# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail 
 # if compiled with default -xalias_level (and optimization level -xO3)
-.IF "$(OS)$(CPU)"=="SOLARISU"
+.IF "$(OS)"=="SOLARIS"
 CDEFS+=-xalias_level=compatible
 .ENDIF
 
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index b9f81f11c890..d91f51595a9a 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -55,6 +55,12 @@ CFLAGS += -fno-inline
 
 .ENDIF
 
+# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
+# if compiled with default -xalias_level (and optimization level -xO3)
+.IF "$(OS)"=="SOLARIS" 
+CDEFS+=-xalias_level=compatible
+.ENDIF
+
 # --- Common ----------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-- 
cgit v1.2.1