--- a/components/opensp/Makefile	Tue Sep 20 05:30:15 2016 -0700
+++ b/components/opensp/Makefile	Tue Sep 20 08:35:58 2016 -0700
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER= gcc
 BUILD_BITS= 64_and_32
 include ../../make-rules/shared-macros.mk
 
@@ -37,13 +38,9 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
-COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv)
-
 # Needed to find the man pages at install time.
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
-CXX +=			$(studio_NORUNPATH)
-
 CONFIGURE_OPTIONS +=	--bindir=/usr/bin
 CONFIGURE_OPTIONS +=	--disable-http
 CONFIGURE_OPTIONS +=	--disable-nls
@@ -65,4 +62,5 @@
         '-e "/FAIL:/p" ' \
         '-e "/ERROR:/p" '
 
-REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime