瀏覽代碼

fix shark backend

wbx 14 年之前
父節點
當前提交
380aa2b200
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 0
      package/openjdk/Makefile
  2. 2 3
      package/openjdk/patches/llvm-headers.patch

+ 1 - 0
package/openjdk/Makefile

@@ -78,6 +78,7 @@ CONFIGURE_ARGS+=	$(CONFIGURE_BACKEND)
 CONFIGURE_ARGS+=	--disable-docs \
 			--disable-bootstrap \
 			--enable-openjdk-cross-compilation \
+			--with-llvm-config=$(STAGING_TARGET_DIR)/usr/bin/llvm-config \
 			--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 			--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
 			--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \

+ 2 - 3
package/openjdk/patches/llvm-headers.patch

@@ -1,6 +1,5 @@
-diff -Nur openjdk-6.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp
---- openjdk-6.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-02-28 17:03:21.000000000 +0100
-+++ openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-29 18:07:20.171550601 +0200
+--- w-openjdk-6.orig/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-02-28 17:03:21.000000000 +0100
++++ w-openjdk-6/openjdk-6/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-29 18:07:20.171550601 +0200
 @@ -43,7 +43,7 @@
  #include <llvm/ModuleProvider.h>
  #endif