--- a/open-src/common/Makefile.inc	Mon Mar 10 15:47:12 2008 -0700
+++ b/open-src/common/Makefile.inc	Mon Mar 10 15:50:06 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.inc	1.87	08/03/07
+# @(#)Makefile.inc	1.88	08/03/10
 #
 
 # Borrowed from Solaris OS/Net makefile.master:
@@ -62,8 +62,9 @@
 
 ### Default compiler & options
 CC     			= cc
+CXX			= CC
 GCC			= /usr/sfw/bin/gcc
-CXX			= CC
+GXX			= /usr/sfw/bin/g++
 DEFAULT_OPT_FLAGS 	= -xO4 -xbuiltin -xlibmil -xprefetch -xdepend
 DEFAULT_OPT_CFLAGS	= $(DEFAULT_OPT_FLAGS) -xstrconst
 DEFAULT_OPT_CXXFLAGS	= $(DEFAULT_OPT_FLAGS)