--- a/components/gcc48/Makefile	Tue Jan 26 12:07:50 2016 -0600
+++ b/components/gcc48/Makefile	Mon Jan 25 17:27:47 2016 -0600
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 export PARFAIT_BUILD=no
 
@@ -56,6 +56,10 @@
 PKG_MACROS +=	GCC_V=$(word 1,$(VERSION_NUMBERS))$(word 2,$(VERSION_NUMBERS))
 PKG_MACROS +=	GCC_BASEDIR=usr/gcc/$(GCC_VERSION)
 
+# Make sure to pass -m32/64 any time the installed GCC is used
+CC += $(CC_BITS)
+CXX += $(CC_BITS)
+
 CFLAGS.i386 = -mtune=opteron -march=opteron
 CFLAGS.sparc = -mtune=ultrasparc -mcpu=ultrasparc -mno-unaligned-doubles
 CFLAGS = -g -O2