diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:20:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:20:39 +0000 |
| commit | eedfccdec3693db08e17b9c79d482686576b5b68 (patch) | |
| tree | 6ba3efbda51364d56aab059203c71222801d3c68 /stlport | |
| parent | e1fbbe4193d158e4bb812f03af1f02ae3141591e (diff) | |
INTEGRATION: CWS hr51 (1.43.4); FILE MERGED
2008/05/05 13:31:14 hr 1.43.4.1: #i88947#: SystemSTL on Solaris with SunStudio compilers means the STLport shipped with the compiler, no need to wrap hash_set and friends
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index bdba4fc87574..518ce967da64 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.43 $ +# $Revision: 1.44 $ # # This file is part of OpenOffice.org. # @@ -40,6 +40,13 @@ TARGET=so_stlport .IF "$(USE_SYSTEM_STL)"=="YES" +.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" +# System STL when building with SunStudio is just a version of STLport +# which comes with the compiler +all: + @echo "Nothing to do" +.ELSE #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC" +# # If you choose to build without stlport, some headers will be used to bring the # sgi extensions into the std namespace: $(INCCOM)$/stlport$/functional \ @@ -51,6 +58,7 @@ $(INCCOM)$/stlport$/rope \ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f) $(MKDIRHIER) $(@:d) $(COPY) $< $@ +.ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC" .ELSE # "$(USE_SYSTEM_STL)" |