/hg/icedtea7: Perform configure checks using ecj.jar if native e...

[andrew at icedtea.classpath.org]

changeset bf2f5ea62322 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=bf2f5ea62322
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 27 03:50:20 2014 +0000

	Perform configure checks using ecj.jar if native ecj is enabled.

	2014-03-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		Perform configure checks using ecj.jar
		if native ecj is enabled.
		* Makefile.am:
		(native-ecj): Link against gcj explicitly.
		* acinclude.m4:
		(IT_FIND_COMPILER): Run IT_WITH_GCJ
		and set JAVAC to an invocation of the ECJ_JAR
		if native ecj is used. Depend on IT_FIND_JAVA
		and IT_FIND_ECJ_JAR for this.
		(IT_FIND_ECJ_JAR): Define only once.
		(IT_WITH_GCJ): Likewise.
		(IT_DIAMOND_CHECK): Depend on IT_CHECK_JAVA_AND_JAVAC_WORK.
		* configure.ac: Remove invocation of IT_WITH_GCJ.


diffstat:

 ChangeLog    |  16 ++++++++++++++++
 Makefile.am  |   2 +-
 acinclude.m4 |  13 +++++++++++--
 configure.ac |   1 -
 4 files changed, 28 insertions(+), 4 deletions(-)

diffs (93 lines):

diff -r 80573ab16562 -r bf2f5ea62322 ChangeLog
--- a/ChangeLog	Mon Mar 24 16:41:29 2014 -0400
+++ b/ChangeLog	Thu Mar 27 03:50:20 2014 +0000
@@ -1,3 +1,19 @@
+2014-03-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	Perform configure checks using ecj.jar
+	if native ecj is enabled.
+	* Makefile.am:
+	(native-ecj): Link against gcj explicitly.
+	* acinclude.m4:
+	(IT_FIND_COMPILER): Run IT_WITH_GCJ
+	and set JAVAC to an invocation of the ECJ_JAR
+	if native ecj is used. Depend on IT_FIND_JAVA
+	and IT_FIND_ECJ_JAR for this.
+	(IT_FIND_ECJ_JAR): Define only once.
+	(IT_WITH_GCJ): Likewise.
+	(IT_DIAMOND_CHECK): Depend on IT_CHECK_JAVA_AND_JAVAC_WORK.
+	* configure.ac: Remove invocation of IT_WITH_GCJ.
+
 2014-03-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* contrib/jck/compile-native-code.sh:
diff -r 80573ab16562 -r bf2f5ea62322 Makefile.am
--- a/Makefile.am	Mon Mar 24 16:41:29 2014 -0400
+++ b/Makefile.am	Thu Mar 27 03:50:20 2014 +0000
@@ -1584,7 +1584,7 @@
 	mkdir -p stamps 
 if BUILD_NATIVE_ECJ
 	${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
+	    --main=org.eclipse.jdt.internal.compiler.batch.Main -lgcj ${ECJ_JAR}
 endif
 	touch $@
 
diff -r 80573ab16562 -r bf2f5ea62322 acinclude.m4
--- a/acinclude.m4	Mon Mar 24 16:41:29 2014 -0400
+++ b/acinclude.m4	Thu Mar 27 03:50:20 2014 +0000
@@ -126,9 +126,17 @@
 
 AC_DEFUN([IT_FIND_COMPILER],
 [
+  AC_REQUIRE([IT_FIND_JAVA])
+  AC_REQUIRE([IT_FIND_ECJ_JAR])
+
   IT_FIND_JAVAC
   IT_FIND_ECJ
   IT_USING_ECJ
+  IT_WITH_GCJ
+  
+  if test x"${GCJ}" != xno ; then
+    JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main"
+  fi
 
   AC_SUBST(ECJ)
   AC_SUBST(JAVAC)
@@ -315,7 +323,7 @@
   AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" = "xyes")
 ])
 
-AC_DEFUN([IT_FIND_ECJ_JAR],
+AC_DEFUN_ONCE([IT_FIND_ECJ_JAR],
 [
   AC_MSG_CHECKING([for an ecj JAR file])
   AC_ARG_WITH([ecj-jar],
@@ -922,7 +930,7 @@
   AM_CONDITIONAL([USE_JDK7], test x"${project}" = "xjdk7")
 ])
 
-AC_DEFUN([IT_WITH_GCJ],
+AC_DEFUN_ONCE([IT_WITH_GCJ],
 [
   AC_MSG_CHECKING([whether to compile ecj natively])
   AC_ARG_WITH([gcj],
@@ -1774,6 +1782,7 @@
 ])
 
 AC_DEFUN([IT_DIAMOND_CHECK],[
+  AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
   AC_CACHE_CHECK([if javac lacks support for the diamond operator], it_cv_diamond, [
   CLASS=Test.java
   BYTECODE=$(echo $CLASS|sed 's#\.java##')
diff -r 80573ab16562 -r bf2f5ea62322 configure.ac
--- a/configure.ac	Mon Mar 24 16:41:29 2014 -0400
+++ b/configure.ac	Thu Mar 27 03:50:20 2014 +0000
@@ -43,7 +43,6 @@
 IT_CHECK_FOR_MERCURIAL
 IT_OBTAIN_HG_REVISIONS
 AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
-IT_WITH_GCJ
 IT_WITH_HOTSPOT_BUILD
 AC_PATH_TOOL([LINUX32],[linux32])
 IT_CHECK_GCC_VERSION