diff options
| author | ohair <none@none> | 2008-07-07 09:11:55 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2008-07-07 09:11:55 -0700 |
| commit | c58418023b98a40e5870959c1586828063c712f8 (patch) | |
| tree | 004a68719011996644c8626079408c5d90d53f7a | |
| parent | c7f0ad51ed07237327b2769073327f9d60daebba (diff) | |
| parent | 36592beaab2ed6f88804006b3b44deee97f199dc (diff) | |
Merge
| -rw-r--r-- | make/jprt.config | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/make/jprt.config b/make/jprt.config index 2e2fbd0..d9b57f0 100644 --- a/make/jprt.config +++ b/make/jprt.config @@ -142,9 +142,15 @@ if [ "${osname}" = SunOS ] ; then 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 |