Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
14293:7327ec5e661e | 14298:4fe850c65ed1 |
---|---|
46 SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | 46 SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 |
47 OPTIONS="-Dsa.library.path=$SA_LIBPATH" | 47 OPTIONS="-Dsa.library.path=$SA_LIBPATH" |
48 CPU=i386 | 48 CPU=i386 |
49 fi | 49 fi |
50 else | 50 else |
51 # configure audit helper library if SA_ALTROOT is set | 51 # configure audit helper library for solaris |
52 if [ -n "$SA_ALTROOT" ]; then | 52 LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so |
53 LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so | 53 if [ ! -f $LD_AUDIT_32 ]; then |
54 export LD_AUDIT_32 | 54 LD_AUDIT_32=$STARTDIR/solaris/`uname -p`/libsaproc_audit.so |
55 if [ ! -f $LD_AUDIT_32 ]; then | 55 fi |
56 echo "SA_ALTROOT is set and can't find libsaproc_audit.so." | 56 if [ ! -f $LD_AUDIT_32 ]; then |
57 echo "Make sure to build it with 'make natives'." | 57 echo "Can't find libsaproc_audit.so." |
58 exit 1 | 58 echo "Make sure to build it with 'make natives'." |
59 fi | 59 exit 1 |
60 fi | 60 fi |
61 export LD_AUDIT_32 | |
61 SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | 62 SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` |
62 OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger" | 63 OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger" |
63 CPU=sparc | 64 CPU=sparc |
64 fi | 65 fi |
65 | 66 |