Mercurial > hg > truffle
diff agent/make/saenv64.sh @ 14298:4fe850c65ed1
7010732: SA_ALTROOT only works if running the SA tools from their build directory.
Summary: fixed SA packaging scripts
Reviewed-by: sla, kevinw
| author | dsamersoff |
|---|---|
| date | Tue, 28 Jan 2014 14:45:39 +0400 |
| parents | f6f3bb0ee072 |
| children | 4ca6dc0799b6 |
line wrap: on
line diff
--- a/agent/make/saenv64.sh Fri Jan 24 08:31:06 2014 -0500 +++ b/agent/make/saenv64.sh Tue Jan 28 14:45:39 2014 +0400 @@ -43,16 +43,19 @@ fi fi -# configure audit helper library if SA_ALTROOT is set -if [ -n "$SA_ALTROOT" ]; then - LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so - export LD_AUDIT_64 - if [ ! -f $LD_AUDIT_64 ]; then - echo "SA_ALTROOT is set and can't find libsaproc_audit.so." - echo "Make sure to build it with 'make natives'." - exit 1 - fi +# configure audit helper library +LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so +if [ ! -f $LD_AUDIT_64 ]; then + LD_AUDIT_64=$STARTDIR/solaris/$CPU/libsaproc_audit.so fi + +if [ ! -f $LD_AUDIT_64 ]; then + echo "Can't find libsaproc_audit.so." + echo "Make sure to build it with 'make natives'." + exit 1 +fi + +export LD_AUDIT_64 SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/$CPU:$STARTDIR/solaris/$CPU OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"