summaryrefslogtreecommitdiff
path: root/package/openjdk/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-04-13 15:16:20 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-13 15:16:20 +0200
commitd46e3d386da9afd01d9ddf1ec35b475678a65d77 (patch)
treee02e1a2402ab5e147abe475e51c3c2a9f8236cfc /package/openjdk/Makefile
parent0d7eae088948ff5b1e0fbf66785ba71848900357 (diff)
parent14737aace17a515e3e7c1f05187909c26a5b1406 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk/Makefile')
-rw-r--r--package/openjdk/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 5522a643c..8d0da3e2c 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -45,7 +45,7 @@ WRKDIST= ${WRKDIR}
WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
PKG_SUBPKGS:= OPENJDK
-PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO JAMVM
+PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO
PKGCD_ZERO:= zero-assembly backend
PKGCD_SHARK:= JIT backend
PKGCD_CACAO:= Cacao JIT backend
@@ -88,8 +88,9 @@ CONFIGURE_ARGS+= --disable-docs \
--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
--without-rhino
-MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
- GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH)
+MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
+ GCC_HONOUR_COPTS=s \
+ 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) \
GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \