--- a/components/gcc3/Makefile Tue Jan 26 12:07:50 2016 -0600
+++ b/components/gcc3/Makefile Mon Jan 25 17:27:47 2016 -0600
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -47,6 +47,10 @@
PKG_MACROS += GNU_ARCH="$(GNU_ARCH)"
+# Make sure to pass -m32/64 any time the installed GCC is used
+CC += -m$(BITS)
+CXX += -m$(BITS)
+
# CC_BITS may get in the way
CC_BITS=