--- a/components/gcc47/developer-gcc4-gcc-c++-47.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/gcc47/developer-gcc4-gcc-c++-47.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,10 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+
+<transform file path=usr/(share/gcc.+\.py) -> \
+    set action.hash $(GCC_BASEDIR)/%<1> >
+<transform file path=usr/share/gdb/auto-load/usr/(lib/.+\.py) -> \
+    set action.hash $(GCC_BASEDIR)/%<1> >
 set name=pkg.fmri \
     value=pkg:/developer/gcc-4/gcc-c++-$(GCC_V)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GCC C++ Compiler - $(GCC_VERSION)"
@@ -35,10 +40,6 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2012/373
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/bin/c++ target=../gcc/$(GCC_VERSION)/bin/c++ mediator=gcc \
-    mediator-version=$(GCC_VERSION)
-link path=usr/bin/g++ target=../gcc/$(GCC_VERSION)/bin/g++ mediator=gcc \
-    mediator-version=$(GCC_VERSION)
 hardlink path=$(GCC_BASEDIR)/bin/$(GNU_ARCH)-c++ target=c++
 hardlink path=$(GCC_BASEDIR)/bin/$(GNU_ARCH)-g++ target=g++
 file path=$(GCC_BASEDIR)/bin/c++
@@ -747,12 +748,10 @@
 file path=$(GCC_BASEDIR)/share/gcc-$(COMPONENT_VERSION)/python/libstdcxx/v6/__init__.py
 file path=$(GCC_BASEDIR)/share/gcc-$(COMPONENT_VERSION)/python/libstdcxx/v6/printers.py
 file path=$(GCC_BASEDIR)/share/man/man1/g++.1
-
-<transform file path=usr/(share/gcc.+\.py) -> \
-    set action.hash $(GCC_BASEDIR)/%<1> >
-<transform file path=usr/share/gdb/auto-load/usr/(lib/.+\.py) -> \
-    set action.hash $(GCC_BASEDIR)/%<1> >
-
+link path=usr/bin/c++ target=../gcc/$(GCC_VERSION)/bin/c++ mediator=gcc \
+    mediator-version=$(GCC_VERSION)
+link path=usr/bin/g++ target=../gcc/$(GCC_VERSION)/bin/g++ mediator=gcc \
+    mediator-version=$(GCC_VERSION)
 file path=usr/share/gcc-$(COMPONENT_VERSION)/python/libstdcxx/__init__.py
 file path=usr/share/gcc-$(COMPONENT_VERSION)/python/libstdcxx/v6/__init__.py
 file path=usr/share/gcc-$(COMPONENT_VERSION)/python/libstdcxx/v6/printers.py
@@ -767,7 +766,7 @@
 license gcc$(GCC_V).license license="GPLv3 with Runtime Exception"
 depend type=require fmri=pkg:/developer/gcc-4/gcc-c-$(GCC_V)
 depend type=require fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime
+depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime-$(GCC_V)
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
-depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
-depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime-$(GCC_V)