[meta-java,v4,10/23] jamvm: Fix binary name for javac

Submitted by Ricardo Ribalda Delgado on July 5, 2019, 11:18 a.m. | Patch ID: 162827

Details

Message ID 20190705111824.22255-11-ricardo@ribalda.com
State Master Next
Delegated to: Richard Leitner
Headers show

Commit Message

Ricardo Ribalda Delgado July 5, 2019, 11:18 a.m.
ecj-initial-native is not a dependency, and even if we add it, we get a
compilation error.

Fixes:
| /bin/bash: /workdir/build/tmp/work/dbfp4-poky-linux/jamvm/2.0.0-devel+gitAUTOINC+6cef41d859-r0/recipe-sysroot-native/usr/bin/ecj-initial: No such file or directory
| Makefile:663: recipe for target 'classes.zip' failed

Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
 recipes-core/jamvm/jamvm.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index fc21380..cdf087e 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -34,8 +34,11 @@  EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm
 # Needed for big compilation targets like OpenJDK
 CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB"
 
+EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/javac \
+                GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \
+               "
 # Enforce usage of ecj-initial.
-EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \
+EXTRA_OEMAKE_class-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \
                 GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \
                "