summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-27 14:12:23 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-28 18:54:09 +0200
commit8c68f7e1dfb5e1a7feea81afbc58e0ac0517ec3e (patch)
tree42f5dbafd4ee6bef39a927991a562b6b467c9bdb
parentf81ec79b21f452d219d43dd56c8214b37640a89e (diff)
fix ecj dl
-rw-r--r--package/ant/Makefile2
-rw-r--r--package/ecj/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/ant/Makefile b/package/ant/Makefile
index fda2e54c9..6c75bc0de 100644
--- a/package/ant/Makefile
+++ b/package/ant/Makefile
@@ -28,7 +28,7 @@ host-build:
if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \
cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar; \
fi
- cp $(DL_DIR)/ecj.jar $(WRKBUILD)/lib/optional
+ cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar
cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \
LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \
JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ; \
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 25fbaae1f..73c55556f 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -26,7 +26,7 @@ ecj-hostinstall:
$(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
-o ${STAGING_HOST_DIR}/usr/bin/ecj.native \
--main=org.eclipse.jdt.internal.compiler.batch.Main \
- $(DL_DIR)/ecj.jar
+ $(DL_DIR)/${PKG_NAME}-${PKG_VERSION}.jar
echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \
${STAGING_HOST_DIR}/usr/bin/ecj
chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj