--- a/components/re2c/Makefile	Tue Jan 26 12:01:07 2016 -0600
+++ b/components/re2c/Makefile	Wed Jan 13 10:15:11 2016 -0600
@@ -18,8 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER =		gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		re2c
@@ -38,9 +40,6 @@
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-COMPILER =		gcc
-GCC_ROOT =		/usr/gcc/4.8
-
 export PATH=$(GCC_ROOT)/bin:/usr/gnu/bin:/usr/bin
 
 # Needed to get the tests to run successfully.