[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] Patch: FYI: detect -encoding option for jikes
From: |
Tom Tromey |
Subject: |
[cp-patches] Patch: FYI: detect -encoding option for jikes |
Date: |
17 Jun 2005 13:27:24 -0600 |
As noted a while ago, jikes does not have a '-encoding' option on
Windows. This patch fixes the build so that we only use this option
where it is available.
Tom
Index: ChangeLog
from Tom Tromey <address@hidden>
* lib/Makefile.am (JAVAC): Use JIKESENCODING.
* m4/acinclude.m4 (CLASSPATH_CHECK_JIKES): Check for -encoding
option to jikes.
(JIKESENCODING): New subst.
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.89
diff -u -r1.89 Makefile.am
--- lib/Makefile.am 14 Jun 2005 23:24:04 -0000 1.89
+++ lib/Makefile.am 17 Jun 2005 19:30:43 -0000
@@ -22,7 +22,7 @@
&& $(GCJF) -C -d . @classes.standardx
else
if FOUND_JIKES
-JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F -encoding UTF-8
-bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath)
-d . @classes
+JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING)
-bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath)
-d . @classes
else
if FOUND_KJC
## FIXME: from what I can tell, kjc does not support a -encoding option.
Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.3
diff -u -r1.3 acinclude.m4
--- m4/acinclude.m4 14 Jun 2005 23:24:04 -0000 1.3
+++ m4/acinclude.m4 17 Jun 2005 19:30:44 -0000
@@ -157,6 +157,12 @@
else
AC_MSG_WARN($JIKES_VERSION: jikes 1.19 or higher required)
fi
+
+ JIKESENCODING=
+ if test -n "`$JIKES --help 2>&1 | grep encoding`"; then
+ JIKESENCODING='-encoding UTF-8'
+ fi
+ AC_SUBST(JIKESENCODING)
fi
])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] Patch: FYI: detect -encoding option for jikes,
Tom Tromey <=