From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27885 invoked by alias); 7 Dec 2007 03:06:05 -0000 Received: (qmail 27859 invoked by uid 367); 7 Dec 2007 03:06:02 -0000 Date: Fri, 07 Dec 2007 03:06:00 -0000 Message-ID: <20071207030602.27844.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Explicitly add -fsource=1.4 to GCJFLAGS. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 96ef4b71529b1b3defe470e577319e1ac440b02c X-Git-Newrev: c609bbcdc6907752ed3ed955d4b5021a4492e6d3 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2007-q4/txt/msg00539.txt.bz2 The branch, master has been updated via c609bbcdc6907752ed3ed955d4b5021a4492e6d3 (commit) from 96ef4b71529b1b3defe470e577319e1ac440b02c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit c609bbcdc6907752ed3ed955d4b5021a4492e6d3 Author: Andrew Cagney Date: Thu Dec 6 22:05:46 2007 -0500 Explicitly add -fsource=1.4 to GCJFLAGS. frysk-common/ChangeLog 2007-12-06 Andrew Cagney * frysk-common.ac (GCJFLAGS): Add -fsource=1.4 when applicable. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 2 ++ frysk-common/frysk-common.ac | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index dde516c..49fc8e2 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,5 +1,7 @@ 2007-12-06 Andrew Cagney + * frysk-common.ac (GCJFLAGS): Add -fsource=1.4 when applicable. + * frysk-common.ac (JAVACFLAGS): For GCJ, re-add -g -classpath lost in previous commit. diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac index 7482d22..54baa98 100644 --- a/frysk-common/frysk-common.ac +++ b/frysk-common/frysk-common.ac @@ -133,7 +133,10 @@ AC_MSG_CHECKING([for working java compiler]) JAVAC=${JAVAC:-${GCJ} -C -fsource=1.4} JAVACFLAGS=${JAVACFLAGS:-${GCJFLAGS} -g -classpath \$(SOURCEPATH):\$(CLASSPATH)} AC_COMPILE_IFELSE([public class conftest{}], - [JAVAC_IS=gcj], + [JAVAC_IS=gcj + if test "x$ac_env_GCJFLAGS_set" != xset; then + GCJFLAGS="$GCJFLAGS -fsource=1.4" + fi], [JAVAC_IS=ecj JAVAC='$(GIJ) --classpath $(ECJ_JAR):$(CLASSPATH) org.eclipse.jdt.internal.compiler.batch.Main -1.4' JAVACFLAGS='-warn:+semicolon -sourcepath $(SOURCEPATH) -classpath $(CLASSPATH)']) hooks/post-receive -- frysk system monitor/debugger