Mercurial > hg > graal-compiler
changeset 1446:5f1100e1cb12
Removed 'java' indirection script and modified domake to create the replacement symlink to /usr/lib/jvm/jre1.7.0/bin/java
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 09 Nov 2010 17:37:01 +0100 |
parents | a7b84a5e16c6 |
children | 1afbc44ee576 |
files | c1x4hotspotsrc/hotspot/java domake |
diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/c1x4hotspotsrc/hotspot/java Tue Nov 09 13:42:06 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -#!/bin/bash -# Launcher for JRE7 modified to run the HotSpotX compiler - -test -n "$JRE7" || { echo "Need to set JRE7 environment variable to the base of a JRE 1.7"; exit 1; } -exec $JRE7/bin/java "$@" -
--- a/domake Tue Nov 09 13:42:06 2010 +0100 +++ b/domake Tue Nov 09 17:37:01 2010 +0100 @@ -7,6 +7,7 @@ while [ -h "$me" ]; do me=`readlink -e "$me"` done +hsx_home=$(cd `dirname $me`; pwd) grep '-client KNOWN' $JRE7/lib/amd64/jvm.cfg >/dev/null if [ $? -ne 0 ] ; then @@ -17,7 +18,13 @@ exit 1 fi -pushd $(dirname "$me")/make +java_link="$hsx_home/c1x4hotspotsrc/hotspot/java" +if [ ! -e $java_link ]; then + echo "Creating link: $java_link -> $JRE7/bin/java" + ln -s $JRE7/bin/java $java_link +fi + +pushd $hsx_home/make ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk/ LANG=C ARCH_DATA_MODEL=64 HOTSPOT_BUILD_JOBS=2 make jvmg1 echo "Copying binaries to JRE7 directory $JRE7" cp ../build/linux/linux_amd64_compiler1/jvmg/libjvm.so $JRE7/lib/amd64/client