--- a/components/gcc5/developer-gcc-gcc-common-5.p5m Fri Sep 30 14:07:25 2016 -0700
+++ b/components/gcc5/developer-gcc-gcc-common-5.p5m Thu Sep 29 15:20:26 2016 -0500
@@ -895,10 +895,6 @@
mediator=gcc mediator-version=$(GCC_MAJOR_VERSION)
link path=usr/bin/gcpp target=../gcc/$(GCC_MAJOR_VERSION)/bin/cpp mediator=gcc \
mediator-version=$(GCC_MAJOR_VERSION)
-# This link is temporary. Once we have migrated everyone from the -$(GCC_MAJOR_VERSION)3 to the -$(GCC_MAJOR_VERSION)
-# package names and to /usr/gcc/5, we can obsolete the -$(GCC_MAJOR_VERSION)3 packages and remove
-# this link.
-link path=usr/gcc/5.3 target=5
link path=usr/share/man/man1/gcov.1 \
target=../../../gcc/$(GCC_MAJOR_VERSION)/share/man/man1/gcov.1 \
mediator=gcc mediator-version=$(GCC_MAJOR_VERSION)
--- a/make-rules/shared-macros.mk Fri Sep 30 14:07:25 2016 -0700
+++ b/make-rules/shared-macros.mk Thu Sep 29 15:20:26 2016 -0500
@@ -468,7 +468,7 @@
export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc
export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++
-GCC_ROOT = /usr/gcc/5.3
+GCC_ROOT = /usr/gcc/5
CC.studio.32 = $(SPRO_VROOT)/bin/cc
CXX.studio.32 = $(SPRO_VROOT)/bin/CC