From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:21:13 +0200 Subject: I am to tupid for git, today. Revert "Revert "fix conflict, autoseect libgcj"" This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a. --- toolchain/gcc/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'toolchain/gcc/Makefile') diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 6e5fd7b49..20f2929b5 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -76,6 +76,7 @@ LANGUAGES:=${LANGUAGES},c++ endif ifeq ($(ADK_TOOLCHAIN_GCC_JAVA),y) LANGUAGES:=${LANGUAGES},java +GCC_CONFOPTS+= --enable-java-home endif ifeq ($(ADK_TOOLCHAIN_GCC_ADA),y) LANGUAGES:=${LANGUAGES},ada -- cgit v1.2.3