--- a/components/bcc/Makefile	Fri Feb 26 15:01:20 2016 +0100
+++ b/components/bcc/Makefile	Wed Mar 02 07:32:20 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 COMPILER =	gcc
@@ -44,6 +44,7 @@
 include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
+CC += $(CC_BITS)
 
 # Create the Makefile before we build
 COMPONENT_PRE_BUILD_ACTION = (cd $(@D) ; CC="$(CC)" $(GMAKE) make.fil)
@@ -58,7 +59,7 @@
 
 
 # common targets
-install build:		$(BUILD_32)
+install build:		$(BUILD_64)
 
 test:		$(NO_TESTS)
 

--- a/components/bcc/bcc.p5m	Fri Feb 26 15:01:20 2016 +0100
+++ b/components/bcc/bcc.p5m	Wed Mar 02 07:32:20 2016 -0800
@@ -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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -35,11 +35,11 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2007/336
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file $(MACH32)/bin/ar86 path=usr/bin/ar86
-file $(MACH32)/bin/as86 path=usr/bin/as86
-file $(MACH32)/bin/Bcc path=usr/bin/bcc
-file $(MACH32)/bin/ld86 path=usr/bin/ld86
-file $(MACH32)/lib/bcc-cc1 path=usr/lib/bcc/bcc-cc1 mode=0555
+file $(MACH64)/bin/ar86 path=usr/bin/ar86
+file $(MACH64)/bin/as86 path=usr/bin/as86
+file $(MACH64)/bin/Bcc path=usr/bin/bcc
+file $(MACH64)/bin/ld86 path=usr/bin/ld86
+file $(MACH64)/lib/bcc-cc1 path=usr/lib/bcc/bcc-cc1 mode=0555
 file man/as86.1 path=usr/share/man/man1/as86.1
 file man/bcc.1 path=usr/share/man/man1/bcc.1
 file man/ld86.1 path=usr/share/man/man1/ld86.1