classpath-native.inc: Set JAVAC through environment variable.

classpath.inc: Set JAVAC through environment variable.

diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc
index bb5abaf178f9f59381e150140b78c895858e05f7..310ca3c3afcf658962b5bb60819470451b78bed8 100644 (file)
--- 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 cfb9f1c089031fc3c5f946e3d6c7b44c085c09b2..0ea5d36f330696a4fd6be37bd7c162ac7e57bb47 100644 (file)
--- 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 \