summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jtools/openjdk/do-extract0
-rw-r--r--package/openjdk/Makefile4
2 files changed, 2 insertions, 2 deletions
diff --git a/jtools/openjdk/do-extract b/jtools/openjdk/do-extract
deleted file mode 100644
index e69de29bb..000000000
--- a/jtools/openjdk/do-extract
+++ /dev/null
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 901fcd541..2233c476b 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -65,7 +65,8 @@ ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
CONFIGURE_BACKEND:= --enable-zero
endif
ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
-CONFIGURE_BACKEND:= --enable-shark
+CONFIGURE_BACKEND:= --enable-shark \
+ --with-llvm-config=$(STAGING_TARGET_DIR)/usr/bin/llvm-config
endif
ifeq ($(ADK_PACKAGE_OPENJDK_CACAO),y)
CONFIGURE_BACKEND:= --enable-cacao
@@ -78,7 +79,6 @@ 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 \