diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-09-13 03:07:26 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-09-13 03:07:26 +0000 |
| commit | afee9db31a894a1bae0af9df745d359427e7163b (patch) | |
| tree | 76df71c5bc301b40a9f2f8405d079ac33a1ff796 /tools | |
| parent | 6b8f866a8200c4bb9264e424f6e66872bfa8de9a (diff) | |
| download | classpath-afee9db31a894a1bae0af9df745d359427e7163b.tar.gz | |
Support GCJ as JAVAC.libgcj-import-20080914
2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* examples/Makefile.am,
* lib/Makefile.am:
Add GCJ rules.
* m4/ac_prog_javac.m4:
Check whether JAVAC is gcj.
* m4/ac_prog_javac_works.m4:
Add GCJ rules.
* m4/acinclude.m4:
Don't bother checking for -J
if using GCJ.
* tools/Makefile.am:
Add GCJ rules.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 3be825a9a..4585e0fa9 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,7 +4,11 @@ GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib/glibj.zip' GLIBJ_CLASSPATH=asm # Setup the compiler to use the GNU Classpath library we just built. +if GCJ_JAVAC +JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH) +else JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH) +endif if CREATE_GJDOC USE_JAVAC_FLAGS = -classpath $(CLASSPATH):$(srcdir):$(ANTLR_JAR):generated:. $(JAVAC_FLAGS) |