From c8d1335ed7217a091508efdca92a3e1438fad390 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 18 Apr 2012 10:43:52 +0200 Subject: Solaris manual build setup - check default install location for 64bit jvm --- make/scripts/setenv-build-jogl-x86_64.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'make/scripts') diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh index d92419b..9c7d674 100644 --- a/make/scripts/setenv-build-jogl-x86_64.sh +++ b/make/scripts/setenv-build-jogl-x86_64.sh @@ -33,7 +33,14 @@ if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then export J2RE_HOME JAVA_HOME fi -if [ -e /opt-solaris-x86_64/jre6 -a -e /opt-solaris-x86_64/j2se6 ] ; then +if [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then + # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin + # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM + J2RE_HOME=/usr/java/jre/bin/amd64 + JAVA_HOME=/usr/java/bin/amd64 + PATH=$J2RE_HOME:$JAVA_HOME:$PATH + export J2RE_HOME JAVA_HOME +elif [ -e /opt-solaris-x86_64/jre6 -a -e /opt-solaris-x86_64/j2se6 ] ; then # make a symbolic link: /opt-solaris-x86_64/jre6/bin/amd64/bin$ ln -s . bin # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM J2RE_HOME=/opt-solaris-x86_64/jre6/bin/amd64 -- cgit v1.2.3