diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-07 19:53:14 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-07 19:53:14 +0200 |
| commit | c20e67a4a06a377a277544a498338fa6a09e9e3f (patch) | |
| tree | 1c2d187d233cb0783a9b6b41bef5555a62ab9112 /jtools/ecj/Makefile | |
| parent | 3b216c1da80a8f768d4bf93569efb742e63797d2 (diff) | |
| parent | 208807cc63754f699107bbad24687b3ae1d326fe (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'jtools/ecj/Makefile')
| -rw-r--r-- | jtools/ecj/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index c4ab831e4..c9e4559a7 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -17,18 +17,22 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ 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 \ + $(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -O2 -findirect-dispatch \ -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 + $(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 # 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 \"\$$@\"" > \ + mv ${STAGING_JAVA_HOST_DIR}/usr/bin/gij ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native + 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/java chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java + 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 |