diff options
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 4fff252e7df..4eb8b7c4135 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -71,11 +71,15 @@ GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT) endif # CANADIAN -GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c +## The compiler with whatever flags we want for both -c and -C +## compiles. +GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 + +GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ -JAVAC = $(GCJ) -C +JAVAC = $(GCJ_WITH_FLAGS) -C EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ |
