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/ecj | |
| parent | c228dba74d4b4536721f9537ad67ac70fd57afe0 (diff) | |
| parent | 6ac888a1e388ebd5e92f957b2c77f326ab197765 (diff) | |
fix merge conflict
Diffstat (limited to 'jtools/ecj')
| -rw-r--r-- | jtools/ecj/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index c9e4559a7..af051f9b9 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -21,7 +21,6 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar - #$(CP) $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj @@ -33,9 +32,5 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ ${STAGING_JAVA_HOST_DIR}/usr/bin/gij chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/gij - rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - rm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java - cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - cp ${STAGING_JAVA_HOST_DIR}/usr/bin/java ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java include $(TOPDIR)/mk/tools.mk |