Merge
authorxdono
Wed, 09 Jul 2008 10:03:55 -0700
changeset 742 d9dc137c39e1
parent 741 32027e94348b (diff)
parent 739 81569efb91b7 (current diff)
child 782 f2e6591ff695
Merge
--- a/make/jprt.config	Thu Jul 03 11:01:29 2008 -0700
+++ b/make/jprt.config	Wed Jul 09 10:03: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