# HG changeset patch # User Gary Benson # Date 1280238092 -3600 # Node ID 8c6cbd644b4f6293a64d0a4816cdcb834b1f3a79 # Parent 67c6131e5d3d17cb96fbdf7aae879696cb4baac0 Work on my home machine again diff -r 67c6131e5d3d -r 8c6cbd644b4f Makefile --- 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 diff -r 67c6131e5d3d -r 8c6cbd644b4f build.sh --- 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