diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:23:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:23:27 +0200 |
| commit | e31e53467bb18e83a01b60881adf35fa8a54531d (patch) | |
| tree | 83272e7c4afeca0b4c1cf009678a12d1751e09f0 /jtools/ant | |
| parent | c228dba74d4b4536721f9537ad67ac70fd57afe0 (diff) | |
| parent | 6ac888a1e388ebd5e92f957b2c77f326ab197765 (diff) | |
fix merge conflict
Diffstat (limited to 'jtools/ant')
| -rw-r--r-- | jtools/ant/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile index 07da1f1a0..537668a21 100644 --- a/jtools/ant/Makefile +++ b/jtools/ant/Makefile @@ -20,7 +20,6 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar cp $(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ - BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \ $(BASH) build.sh |