summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-07-22 06:43:10 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-07-22 06:43:10 +0000
commitcf91c71446e557ba253d492898d59e5990516f4c (patch)
tree018ea731792b0f757c267bcba5f634aee74bc569
parent73a089c563b803abf97c6a4372c458dba5fff1ad (diff)
classpath-native.inc: Set JAVAC through environment variable.
classpath.inc: Set JAVAC through environment variable.
-rw-r--r--packages/classpath/classpath-native.inc4
-rw-r--r--packages/classpath/classpath.inc6
2 files changed, 9 insertions, 1 deletions
diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc
index bb5abaf178..310ca3c3af 100644
--- a/packages/classpath/classpath-native.inc
+++ b/packages/classpath/classpath-native.inc
@@ -10,6 +10,10 @@ DEPENDS = "ecj-initial fastjar-native zip-native"
inherit autotools native
+# Newer versions expect setting the compiler through this
+# environment variable.
+export JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial
+
EXTRA_OECONF = "\
--with-glibj \
--with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index cfb9f1c089..0ea5d36f33 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -20,9 +20,13 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
S = "${WORKDIR}/${PBN}-${PV}"
+# Newer versions expect setting the compiler through this
+# environment variable.
+export JAVAC=${STAGING_BINDIR_NATIVE}/javac
+
EXTRA_OECONF = "\
--with-glibj \
- --with-ecj=javac \
+ --with-ecj=${STAGING_BINDIR_NATIVE}/javac \
--with-fastjar=fastjar \
--includedir=${includedir}/classpath \
--with-vm=java \