--- a/components/openexr/Makefile	Fri Apr 10 13:32:09 2015 -0700
+++ b/components/openexr/Makefile	Fri Apr 10 16:26:11 2015 -0700
@@ -45,10 +45,7 @@
 
 # it seems that --with-pic doesn't get PIC flags to the C++ compiler
 CXXFLAGS += $(CC_PIC)
-
-ifneq (, $(findstring 12.4,$(CXX)))
-  CXXFLAGS += -template=extdef
-endif
+CXXFLAGS += -template=extdef
 
 # libtools seems to be forcing -nolibs, so we have to add back libc, libm,
 # libCstd and libCrun. The last two are needed because with Studio 12.2

--- a/components/subversion/Makefile	Fri Apr 10 13:32:09 2015 -0700
+++ b/components/subversion/Makefile	Fri Apr 10 16:26:11 2015 -0700
@@ -85,11 +85,6 @@
 PERL_ARCH_16 = $(PERL_ARCH_16_$(MACH))
 APR_VERSION = 1.5
 APR_UTIL_VERSION = 1.5
-SS_VERSION := 12.3
-
-ifneq (, $(findstring 12.4,$(CXX)))
-  SS_VERSION := 12.4
-endif
 
 # Let's write some post-configure hacks
 COMPONENT_POST_CONFIGURE_ACTION = \

--- a/make-rules/shared-macros.mk	Fri Apr 10 13:32:09 2015 -0700
+++ b/make-rules/shared-macros.mk	Fri Apr 10 16:26:11 2015 -0700
@@ -384,7 +384,7 @@
 BUILD_TOOLS ?=	/ws/on12-tools
 
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
-SPRO_VROOT =	$(SPRO_ROOT)/solarisstudio12.3
+SPRO_VROOT =	$(SPRO_ROOT)/solarisstudio12.4
 
 PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.5.1
 PARFAIT_TOOLS=	$(WS_TOOLS)/$(MACH)/parfait
@@ -927,7 +927,7 @@
 endif
 ifeq ($(COMPILER),studio)
 # uncomment this line if you need to install Studio
-#REQUIRED_PACKAGES += developer/solarisstudio-123
+#REQUIRED_PACKAGES += developer/solarisstudio-124
 endif
 ifeq ($(PARFAIT_BUILD),yes)
 # uncomment this line if you need to install Parfait