--- a/components/llvm/cxa_finalize/Makefile	Fri Jan 27 16:34:13 2017 -0800
+++ b/components/llvm/cxa_finalize/Makefile	Wed Mar 08 22:04:29 2017 -0800
@@ -20,10 +20,11 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 export PARFAIT_BUILD=no
 COMPILER= gcc
+COMPONENT_ARCHIVE=
 
 include ../../../make-rules/shared-macros.mk
 
@@ -36,13 +37,11 @@
 OBJECTS = cxa_finalize-32.o cxa_finalize-64.o \
 	  cxa_finalize_pic-32.o cxa_finalize_pic-64.o
 
+BUILD_STYLE= pkg
 include $(WS_MAKE_RULES)/common.mk
 
-GCC_VERSION := 4.9
-
-# We need GCC version 4.9, and not another version.
-CC=/usr/gcc/$(GCC_VERSION)/bin/gcc
-CXX=/usr/gcc/$(GCC_VERSION)/bin/g++
+# We need GCC version 5, and not another version; see components/llvm/Makefile.
+GCC_ROOT=/usr/gcc/5
 
 RELEASE_LIST=Debug+Asserts+Checks Debug+Asserts Debug Release+Debug Release Unoptimized