summaryrefslogtreecommitdiff
path: root/package/openjdk/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/openjdk/Makefile')
-rw-r--r--package/openjdk/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 08d80e4c4..fb7e89be4 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -50,6 +50,7 @@ PKG_SUBPKGS:= OPENJDK
PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO
PKGCD_ZERO:= zero-assembly backend
PKGCD_SHARK:= JIT backend
+PKGCB_SHARK:= llvm
PKGCD_CACAO:= Cacao JIT backend
PKGCD_JAMVM:= JamVM backend
@@ -95,6 +96,7 @@ MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
OPENJDK_NATIVE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
+ PATH=$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \
TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
ALL_TARGET:= icedtea
@@ -109,7 +111,7 @@ do-extract:
pre-configure:
cd ${WRKBUILD}; rm -rf config.{cache,status}; \
- export ${OPENJDK_NATIVE_ENV} $(MAKE_ENV) ; ./configure \
+ export $(MAKE_ENV) ${OPENJDK_NATIVE_ENV} ; ./configure \
${CONFIGURE_TRIPLE} \
$(CONFIGURE_BACKEND) \
--prefix=/usr \