OpenJDK / amber / amber
changeset 782:f2e6591ff695
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 16:38:40 +0200 |
| parents | e1baa9c8f16f d9dc137c39e1 |
| children | 9849c0c0d518 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Fri Jul 11 01:14:44 2008 -0700 +++ b/.hgtags-top-repo Wed Jul 05 16:38:40 2017 +0200 @@ -4,3 +4,4 @@ 11b4dc9f2be3523ef989a0db8459eb56b3045c3a jdk7-b27 56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28 31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29 +2dab2f712e1832c92acfa63ec0337048b9422c20 jdk7-b30
--- a/make/jprt.config Fri Jul 11 01:14:44 2008 -0700 +++ b/make/jprt.config Wed Jul 05 16:38:40 2017 +0200 @@ -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