strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ooo11rc (1.12.2); FILE MERGED

Browse source 
2003/06/19 07:40:21 mh 1.12.2.1: add: fixes for Solaris C55, #i15800#
This commit is contained in:
Vladimir Glazounov 2003-07-02 12:43:49 +00:00
parent 34de3e0235
commit 2dc80d8e1f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
solenv/inc/tg_compv.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: tg_compv.mk,v $
#
# $Revision: 1.12 $
# $Revision: 1.13 $
#
# last change: $Author: vg $ $Date: 2003-06-12 10:00:41 $
# last change: $Author: vg $ $Date: 2003-07-02 13:43:49 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -81,7 +81,7 @@ CFLAGSVERSION_CMD= |& $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk
CFLAGSNUMVERSION_CMD= |& $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
.ENDIF
.IF "$(COM)"=="C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
.IF "$(COM)"=="C55" || "$(COM)"=="C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
CFLAGSVERSION= -V
CFLAGSVERSION_CMD= -V |& $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk
CFLAGSNUMVERSION_CMD= -V |& $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
@ -131,7 +131,7 @@ SHORTSTDCPP3="5"
.ENDIF
.ENDIF
.IF "$(COM)" == "C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
.IF "$(COM)"=="C55" || "$(COM)" == "C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro"
.IF "$(CCNUMVER)">="00050002"
COMID=C52
COMNAME=sunpro5