# HG changeset patch
# User ohair
# Date 1215447115 25200
# Node ID e42c6a1e1fb43e7ffb1464e8d0d8a6e52a5d049b
# Parent  2dab2f712e1832c92acfa63ec0337048b9422c20# Parent  cda4ce5a6494852a4d0e5681d81b24070c7d2648
Merge

diff -r 2dab2f712e18 -r e42c6a1e1fb4 make/jprt.config
--- a/make/jprt.config	Wed Jul 02 12:55:04 2008 -0700
+++ b/make/jprt.config	Mon Jul 07 09:11:55 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