Mercurial > hg > truffle
diff agent/make/saenv.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 | fac3dd92ebaf |
| children | 4ca6dc0799b6 |
line wrap: on
line diff
--- a/agent/make/saenv.sh Fri Jan 24 08:31:06 2014 -0500 +++ b/agent/make/saenv.sh Tue Jan 28 14:45:39 2014 +0400 @@ -48,16 +48,17 @@ CPU=i386 fi else - # configure audit helper library if SA_ALTROOT is set - if [ -n "$SA_ALTROOT" ]; then - LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so - export LD_AUDIT_32 - if [ ! -f $LD_AUDIT_32 ]; 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 for solaris + LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so + if [ ! -f $LD_AUDIT_32 ]; then + LD_AUDIT_32=$STARTDIR/solaris/`uname -p`/libsaproc_audit.so + fi + if [ ! -f $LD_AUDIT_32 ]; then + echo "Can't find libsaproc_audit.so." + echo "Make sure to build it with 'make natives'." + exit 1 fi + export LD_AUDIT_32 SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger" CPU=sparc