From 7356a92fbf59f66521b2e7fdd478b0fa63df052d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 6 Apr 2011 14:25:15 +0200
Subject: add wrappers for ecj and gij, allow to start openjdk bootstrap target
 jdk compile

---
 jtools/ecj/Makefile | 9 ++++++++-
 jtools/gcj/Makefile | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'jtools')

diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index 32cfdeb53..a67e9ebd8 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -18,9 +18,16 @@ ${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
 
 include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index ea41ca671..7ccd03c15 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -26,9 +26,9 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 			--enable-java-home \
 			--enable-languages=java \
 			--with-ffi \
-			--with-mpc=$(STAGING_HOST_DIR) \
-			--with-mpfr=$(STAGING_HOST_DIR) \
-			--with-gmp=$(STAGING_HOST_DIR) \
+			--with-mpc=$(STAGING_HOST_DIR)/usr \
+			--with-mpfr=$(STAGING_HOST_DIR)/usr \
+			--with-gmp=$(STAGING_HOST_DIR)/usr \
 			--disable-libmudflap \
 			--disable-libgomp \
 			--disable-biarch \
-- 
cgit v1.2.3