Mercurial > hg > truffle

comparison make/jprt.config @ 194:4f91c08b3e44 jdk7-b29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Tue, 17 Jun 2008 15:27:05 -0700
parents a49545cab84a
children d1605aabd0a1
comparison
equal deleted inserted replaced
151:abe7181cbe8a 194:4f91c08b3e44
66 solaris_arch=sparc 66 solaris_arch=sparc
67 else 67 else
68 solaris_arch=i386 68 solaris_arch=i386
69 fi 69 fi
70 70
71 # Get the SS11 compilers into path (make sure it matches ALT setting) 71 if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
72 compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/SS11/bin 72 compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
73 else
74 if [ "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6" -o \
75 "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u10" -o \
76 "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6perf" ] ; then
77 # All jdk6 builds use SS11
78 compiler_name=SS11
79 else
80 # FIXUP: Change to SS12 once it has been validated.
81 #compiler_name=SS12
82 compiler_name=SS11
83 fi
84 fi
85
86 # Get into path (make sure it matches ALT setting)
87 compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/${compiler_name}/bin
73 dirMustExist "${compiler_path}" COMPILER_PATH 88 dirMustExist "${compiler_path}" COMPILER_PATH
74 path4sdk=${compiler_path} 89 path4sdk=${compiler_path}
75 90
76 # Add basic solaris system paths 91 # Add basic solaris system paths
77 path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin 92 path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin