diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /jtools/ecj/Makefile | |
parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'jtools/ecj/Makefile')
-rw-r--r-- | jtools/ecj/Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index 32cfdeb53..c4ab831e4 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ecj PKG_VERSION:= 1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa include ../rules.mk @@ -18,9 +18,20 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \ $(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \ - -o ${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-4.5.2/ecj.jar $(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/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 + # put a wrapper for java here + echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \"\$$@\"" > \ + ${STAGING_JAVA_HOST_DIR}/usr/bin/java + chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java + 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 |