aboutsummaryrefslogtreecommitdiffstats
path: root/make/scripts/setenv-build-jogl-x86_64.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-04-18 10:43:52 +0200
committerSven Gothel <[email protected]>2012-04-18 10:43:52 +0200
commitc8d1335ed7217a091508efdca92a3e1438fad390 (patch)
treec9e180ae895fdc3974f1bf15c7df31d2e50c275d /make/scripts/setenv-build-jogl-x86_64.sh
parent900b2a73b2d0b6f934718ac88015151c5bf7ccb8 (diff)
Solaris manual build setup - check default install location for 64bit jvm
Diffstat (limited to 'make/scripts/setenv-build-jogl-x86_64.sh')
-rw-r--r--make/scripts/setenv-build-jogl-x86_64.sh9
1 files changed, 8 insertions, 1 deletions
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