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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index a29f6b5f1..8104ee764 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -8,7 +8,11 @@ sinclude $(JAVA_DEPEND) compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER) # handling source to bytecode compiler programs like gcj, jikes and kjc +if GCJ_JAVAC +JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --bootclasspath='' --classpath=$(compile_classpath) -d . @classes +else JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes +endif if CREATE_COLLECTIONS COLLECTIONS = collections.jar |