From 7f60e6cf0e0bf73ffd396f7198627c8922d4865b Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 2 Apr 2011 19:55:04 +0000 Subject: fix ecj build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • -Bsymbolic is only for GNU ld on ELF creating DLLs, not for Apple ld on Mach-O creating binaries • /usr/lib64 doesn’t exist on some OSes, I might have heard… • indent Signed-off-by: Thorsten Glaser --- jtools/ecj/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'jtools/ecj/Makefile') diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index ffa6cd43e..e87354132 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -13,10 +13,12 @@ include ../rules.mk install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: - env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ - PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \ - $(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -Wl,-Bsymbolic -findirect-dispatch \ - -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \ + env \ + 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 \ + --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 -- cgit v1.2.3 From afc6a2ce6bfdb25f47a0303f94c872aadbbb7e8c Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 2 Apr 2011 20:53:19 +0000 Subject: help gcj/ecj both to find their dylibs on Mac as well as others Signed-off-by: Thorsten Glaser --- jtools/ecj/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'jtools/ecj/Makefile') diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile index e87354132..32cfdeb53 100644 --- a/jtools/ecj/Makefile +++ b/jtools/ecj/Makefile @@ -14,6 +14,7 @@ install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj: env \ + 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 \ -- cgit v1.2.3