diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:48:50 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:48:50 +0000 |
| commit | fea01dc44d7299c24f7d50e0c37a71d5cbd466f9 (patch) | |
| tree | 3f75abaf2fda32ed9176fc91e46f83a61270d61b | |
| parent | 13a3948f40e8f3b5f4fb673e2c6e889e158be590 (diff) | |
INTEGRATION: CWS jre5issues (1.2.26); FILE MERGED
2005/01/14 10:09:06 jl 1.2.26.1: #i39912# fixes for MAC
| -rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk index a27688fbbcb7..8a021d1f6ddd 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2004-07-23 11:50:08 $ +# last change: $Author: rt $ $Date: 2005-01-31 09:48:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -75,7 +75,11 @@ ENABLE_EXCEPTIONS=true .INCLUDE : settings.mk -.IF "$(SOLAR_JAVA)"=="" || "$(OS)"=="MACOSX" +.IF "$(OS)"=="MACOSX" +STDLIBCUIMT+=-lstdc++ +.ENDIF + +.IF "$(SOLAR_JAVA)"=="" nojava: @echo "Not building jvmfwk/plugins/javaenvsetup/ because Java is disabled" .ENDIF |