diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-12-21 15:51:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-12-21 15:51:24 +0000 |
| commit | 9124f750e7cffe21f66e933fdbb459d62bd6bf6a (patch) | |
| tree | 6f1af8dc86fbdda38d56f9daf3da3b2f50aa32f6 /stlport | |
| parent | 2f3ca91a95e3307884bbbcae7970a7c9f8e3d08a (diff) | |
INTEGRATION: CWS hr24 (1.32.16); FILE MERGED
2005/12/13 15:05:27 hr 1.32.16.1: #i59294#: new makefile for Sun Studio 11
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index abcd85e7c946..cdb5cf577474 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.32 $ +# $Revision: 1.33 $ # -# last change: $Author: rt $ $Date: 2005-09-08 07:48:02 $ +# last change: $Author: obo $ $Date: 2005-12-21 16:51:24 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -89,7 +89,7 @@ PATCH_FILE_NAME=STLport-4.5-0119.patch TAR_EXCLUDES=*/SC5/* .ENDIF # "$(USE_SHELL)"=="4nt" -ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak +ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak CONFIGURE_ACTION=none @@ -133,11 +133,13 @@ BUILD_FLAGS=-f vc7.mak .IF "$(COM)"=="C52" BUILD_ACTION=make -.IF "$(CCNUMVER)">="00050005" +.IF "$(CCNUMVER)">="00050008" +BUILD_FLAGS=-f sunpro11.mak +.ELIF "$(CCNUMVER)">="00050005" BUILD_FLAGS=-f sunpro8.mak .ELSE BUILD_FLAGS=-f sunpro6.mak -.ENDIF # "$(CCNUMVER)">="00050005" +.ENDIF # "$(CCNUMVER)">="00050008" OUT2INC= \ stlport$/SC5$/*.SUNWCCh |