From cf795445a5a18225b67074415b673359e4399ba9 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Tue, 24 Feb 2009 15:57:00 +0100
Subject: [PATCH] use HOSTGCJ as GCJ_FOR_ECJX

---
 toolchain/dependencies/dependencies.mk |  9 +++++++++
 toolchain/dependencies/dependencies.sh | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/toolchain/dependencies/dependencies.mk b/toolchain/dependencies/dependencies.mk
index 53a8f19..1bec1bc 100644
--- a/toolchain/dependencies/dependencies.mk
+++ b/toolchain/dependencies/dependencies.mk
@@ -21,6 +21,13 @@ ifeq ($(findstring y,$(BR2_TARGET_SYSLINUX)$(BR2_TARGET_PXELINUX)),y)
 NEED_NASM:=y
 DEPENDENCIES_HOST_PREREQ+=host-nasm
 endif
+ifeq ($(BR2_GCC_CROSS_GCJ),y)
+NEED_GCJ_FOR_ECJX:=$(HOSTGCJ)
+endif
+ifndef GCJ_FOR_ECJX
+GCJ_FOR_ECJX:=$(HOSTGCJ)
+export GCJ_FOR_ECJX
+endif
 
 # We record the environ of the caller to see if we have to recheck
 # via dependencies.sh.
@@ -44,6 +51,7 @@ $(dependencies): $(ENV_DEP_HOST) .config
 			HOST_SED_DIR="$(HOST_SED_DIR)" \
 			NEED_RUBY="$(NEED_RUBY)" \
 			NEED_NASM="$(NEED_NASM)" \
+			NEED_GCJ_FOR_ECJX="$(NEED_GCJ_FOR_ECJX)" \
 			$(TOPDIR)/toolchain/dependencies/dependencies.sh; \
 		$(MAKE1) host-sed $(DEPENDENCIES_HOST_PREREQ); \
 		touch -c $@; \
@@ -54,6 +62,7 @@ do-dependencies: $(dependencies)
 		HOST_SED_DIR="$(HOST_SED_DIR)" \
 		NEED_RUBY="$(NEED_RUBY)" \
 		NEED_NASM="$(NEED_NASM)" \
+		NEED_GCJ_FOR_ECJX="$(NEED_GCJ_FOR_ECJX)" \
 		$(TOPDIR)/toolchain/dependencies/dependencies.sh
 	$(MAKE1) host-sed $(DEPENDENCIES_HOST_PREREQ)
 
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index 7496d98..6b0df10 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -328,6 +328,23 @@ fi
 
 #############################################################
 #
+# check build system java compiler to build ecj
+#
+#############################################################
+
+if [ "x$NEED_GCJ_FOR_ECJX" != "x" ]
+then
+SOME_GCJ_FOR_ECJX=$(which $GCJ_FOR_ECJX 2> /dev/null)
+  if [ -z "$SOME_GCJ_FOR_ECJX" ] ; then
+	echo "gcj for ecj installed:		    FALSE"
+	/bin/echo -e "\n\nYou must install a java compiler on your build machine\n"
+	exit 1
+  fi
+fi
+
+
+#############################################################
+#
 # check build system 'help2man'
 #
 #############################################################
-- 
2.11.4.GIT