Author: pfg
Date: Wed Nov 25 17:29:09 2015
New Revision: 1716498
URL: http://svn.apache.org/viewvc?rev=1716498&view=rev
Log:
i125362 - Illumos port: consider GCC for some Sun Studio specifics
Patch by: Alexander Pyhalov
Modified:
openoffice/trunk/main/basebmp/source/makefile.mk
Modified: openoffice/trunk/main/basebmp/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/source/makefile.mk?rev=1716498&r1=1716497&r2=1716498&view=diff
==============================================================================
--- openoffice/trunk/main/basebmp/source/makefile.mk (original)
+++ openoffice/trunk/main/basebmp/source/makefile.mk Wed Nov 25 17:29:09 2015
@@ -51,7 +51,7 @@ CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PAR
# 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"
+.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
# For Sun Studio 8 this switch does not work: compilation fails on
bitmapdevice.cxx
.IF "$(CCNUMVER)"!="00050005"
CDEFS+=-xalias_level=compatible
