summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/cacao/cacao-native.inc11
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/cacao/cacao-native.inc b/packages/cacao/cacao-native.inc
index 8ae2874253..f4eee16cf6 100644
--- a/packages/cacao/cacao-native.inc
+++ b/packages/cacao/cacao-native.inc
@@ -17,7 +17,7 @@ EXTRA_OECONF = "\
--with-vm-zip=${datadir}/cacao/vm.zip \
\
--with-classpath-libdir=${libdir_jni}:${libdir} \
- --with-classpath-includedir=${includedir}/classpath \
+ --with-classpath-includedir=${incdir}/classpath \
--with-classpath-classes=${datadir}/classpath/glibj.zip \
\
--with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
@@ -26,8 +26,11 @@ EXTRA_OECONF = "\
--with-jni_h=${incdir}/classpath \
"
-# force usage of ecj-initial (but Java5-compatible class library)
-export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
+# force usage of ecj-initial
+# Important: Not specifying the bootclasspath argument here is only supported
+# for Cacao >= 0.99. Earlier Cacao may need the BCP set to a Java5-capable
+# class library.
+export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial"
# force usage of fastjar
-export JAR=fastjar
+export JAR="fastjar"