Skip to content

Commit a96698f

Browse files
More OpenJDK 8 fixes.
Use -source/-target 1.6 instead of 1.5 for examples and tools too.
1 parent 4378022 commit a96698f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

examples/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
GLIBJ_CLASSPATH='$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib'
33

44
# source, target and classpath options
5-
GCJ_OPTS = -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_CLASSPATH) --classpath='$(top_builddir)/tools/tools.zip'
6-
ECJ_OPTS = -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip'
5+
GCJ_OPTS = -fsource=1.6 -ftarget=1.6 --encoding=UTF-8 --bootclasspath=$(GLIBJ_CLASSPATH) --classpath='$(top_builddir)/tools/tools.zip'
6+
ECJ_OPTS = -source 1.6 -target 1.6 -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath '$(top_builddir)/tools/tools.zip'
77

88
if GCJ_JAVAC
99
JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(GCJ_OPTS)

tools/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ GLIBJ_CLASSPATH=asm:$(ANTLR_CLASSPATH)
1515
# Setup the compiler to use the GNU Classpath library we just built.
1616

1717
# source, target and classpath options
18-
GCJ_OPTS = -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH)
19-
ECJ_OPTS = -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH)
18+
GCJ_OPTS = -fsource=1.6 -ftarget=1.6 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH)
19+
ECJ_OPTS = -source 1.6 -target 1.6 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH)
2020

2121
if GCJ_JAVAC
2222
JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(GCJ_OPTS)

0 commit comments

Comments
 (0)