diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/classpath/classpath-native.inc | 4 | ||||
| -rw-r--r-- | packages/classpath/classpath.inc | 6 |
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 \ |