From e8c76b35182a24385949e28c76c56db0d86bb7b0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Apr 2011 16:40:24 +0200
Subject: add a java build tool directory

following build tools seem to be required to cross-compile
OpenJDK:
 - fastjar
 - classpath
 - gcj
 - jamvm
 - ecj

Maybe cacao is better, maybe ant is required, too.
... hacking...
---
 mk/build.mk | 7 +++++--
 mk/vars.mk  | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 62c9245cf..acc0d0351 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -123,9 +123,9 @@ ifeq ($(ADK_NATIVE),y)
 	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
 else
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
-	$(MAKE) -f mk/build.mk toolchain/install tools/install package/compile
+	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile
 else
-	$(MAKE) -f mk/build.mk toolchain/install tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
+	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
 endif
 
@@ -157,6 +157,9 @@ toolchain/%: ${STAGING_DIR}
 tools/%:
 	$(MAKE) -C tools $(patsubst tools/%,%,$@)
 
+jtools/%:
+	$(MAKE) -C jtools $(patsubst jtools/%,%,$@)
+
 image:
 	$(MAKE) -C target image
 
diff --git a/mk/vars.mk b/mk/vars.mk
index e5959f203..e7e6571c0 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,6 +18,7 @@ STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
+STAGING_JAVA_HOST_DIR:=	${BASE_DIR}/jhost
 # use headers and foo-config from system
 ifneq ($(ADK_NATIVE),)
 STAGING_TARGET_DIR:=
@@ -34,6 +35,7 @@ STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
+JTOOLS_BUILD_DIR=	$(BASE_DIR)/jtools_build
 TOOLS_DIR:=		$(BASE_DIR)/bin/tools
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
 BIN_DIR:=		$(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
-- 
cgit v1.2.3