--- a/make-rules/shared-macros.mk	Mon May 09 10:46:28 2011 -0700
+++ b/make-rules/shared-macros.mk	Mon May 09 11:36:28 2011 -0700
@@ -427,9 +427,6 @@
 CFLAGS +=	$(CFLAGS.$(COMPILER))
 
 
-# C++ compiler usually wants all of the C compiler options too
-CXXFLAGS +=	$(CFLAGS)
-
 # Studio C++ requires -norunpath to avoid adding its location into the RUNPATH
 # to C++ applications.
 studio_NORUNPATH =	 -norunpath
@@ -456,6 +453,9 @@
 # linker flags.  We never want the Studio location added to the RUNPATH.
 CXXFLAGS +=	$($(COMPILER)_NORUNPATH)
 
+# Build 32 or 64 bit objects in C++ as well.
+CXXFLAGS +=	$(CC_BITS)
+
 #
 # Solaris linker flag sets to ease feature selection.  Add the required
 # feature to your Makefile with LDFLAGS += $(FEATURE_MACRO) and add to the