# HG changeset patch
# User ohair
# Date 1215104965 25200
# Node ID cda4ce5a6494852a4d0e5681d81b24070c7d2648
# Parent  14c2c623d687c420512229b1fa19ad3a85be9f1a
6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
Summary: Changes to support building with SS12.
Reviewed-by: tbell

diff -r 14c2c623d687 -r cda4ce5a6494 make/jprt.config
--- a/make/jprt.config	Fri Jun 20 08:44:54 2008 -0700
+++ b/make/jprt.config	Thu Jul 03 10:09:25 2008 -0700
@@ -142,9 +142,15 @@
 	solaris_arch=i386
     fi
 
-    # Get the SS11 compilers into path (make sure it matches ALT setting)
-    compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/SS11/bin
-    compiler_name=SS11
+    # Get the compilers into path (make sure it matches ALT setting)
+    if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
+        compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
+    else
+        # FIXUP: Change to SS12 when validated
+	#compiler_name=SS12
+	compiler_name=SS11
+    fi
+    compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
     ALT_COMPILER_PATH="${compiler_path}"
     export ALT_COMPILER_PATH
     dirMustExist "${compiler_path}" ALT_COMPILER_PATH