# HG changeset patch
# User Michael Haupt <michael.haupt@oracle.com>
# Date 1320856154 -3600
# Node ID 019c1951cb048bf2242b479f7051d8abc47f5526
# Parent  e81927755129e81f5c5c1b77d7cb299d495c410a
fixes for build process

diff -r e81927755129 -r 019c1951cb04 pytools/commands.py
--- a/pytools/commands.py	Wed Nov 09 17:02:12 2011 +0100
+++ b/pytools/commands.py	Wed Nov 09 17:29:14 2011 +0100
@@ -140,7 +140,7 @@
     fix_jvm_cfg(env, env.jdk7)
 
     if env.get_os() != 'windows':
-        javaLink = join(env.graal_home, 'graal', 'hotspot', 'java')
+        javaLink = join(env.graal_home, 'hotspot', 'java')
         if not exists(javaLink):
             javaExe = join(env.jdk7, 'jre', 'bin', 'java')
             env.log('Creating link: ' + javaLink + ' -> ' + javaExe)
@@ -151,7 +151,7 @@
         env.log('Creating Graal directory in JDK7: ' + graalVmDir)
         os.makedirs(graalVmDir)
 
-    os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7g, INSTALL='y')
+    os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7, INSTALL='y')
     env.run(['gmake', 'jvmggraal'], cwd=join(env.graal_home, 'make'))
 
     os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7, INSTALL='y')