INTEGRATION: CWS jre5issues (1.2.26); FILE MERGED

2005/01/14 10:09:06 jl 1.2.26.1: #i39912# fixes for MAC

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