Mercurial > hg > shark

changeset 21:8c6cbd644b4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on my home machine again
author Gary Benson <gbenson@redhat.com>
date Tue, 27 Jul 2010 14:41:32 +0100
parents 67c6131e5d3d
children 3460f6c2fae8
files Makefile build.sh
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Jun 11 10:37:23 2010 +0100
+++ b/Makefile	Tue Jul 27 14:41:32 2010 +0100
@@ -1,4 +1,4 @@
-JAVADIR = /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64
+JAVADIR = $(PWD)/icedtea6-1.7.1/openjdk/build/linux-amd64/j2sdk-image
 BOOTDIR = bootstrap
 
 TARGETS = product debug productzero debugzero productshark debugshark
--- a/build.sh	Fri Jun 11 10:37:23 2010 +0100
+++ b/build.sh	Tue Jul 27 14:41:32 2010 +0100
@@ -31,7 +31,7 @@
 # Export variables needed for Shark builds
 if [ "$mode" = shark ]; then
     set +x
-    LLVM_CONFIG=/jck/build/llvm-2.6/Release/bin/llvm-config
+    LLVM_CONFIG=/home/gary/work/llvm/llvm-2.6/Release/bin/llvm-config
     llvm_components="jit engine nativecodegen"
 
     # LLVM_CFLAGS
@@ -80,7 +80,7 @@
 
 # Build it
 make -C hotspot/make \
-  HOTSPOT_BUILD_JOBS=5 \
+  HOTSPOT_BUILD_JOBS=3 \
   ALT_SLASH_JAVA=$PWD/$bootdir \
     all_$target$mode copy_${target}_jdk export_${target}_jdk