[m-rev.] diff: disable mfilterjavac by default

[Julien Fischer]

Disable mfilterjavac for now.

mfilterjavac is currently causing problems when installing the java grade
from
the stage 2 dir.  It can be re-enabled when the following sequence of
actions
works correctly:

(1) Build stage 1 using rotd-2013-04-18
(2) Bootcheck (or otherwise build the stage 2 compiler).
(3) cd stage2 && mmake install (with the java grade as one of the grades
    to install).

compiler/options.m:
Disable the use of mfilterjavac for now.

compiler/mlds_to_java.m:
Update a comment.

Julien.

diff --git a/compiler/mlds_to_java.m b/compiler/mlds_to_java.m
index 5f8b09b..fcf3b90 100644
--- a/compiler/mlds_to_java.m
+++ b/compiler/mlds_to_java.m
@@ -5193,7 +5193,7 @@ output_context(Info, Marker, Context, !IO) :-
             % \u is treated as a Unicode escape even with comments.
             string.replace_all(File, "\\u", "\\\\u", SafePath),
             % Do not modify this format string without modifying
-            % util/mfilterjavac.m
+            % mfilterjavac/mfilterjavac.m
             io.format("// %s %s:%d\n",
                 [s(marker_string(Marker)), s(SafePath), i(Line)], !IO),
             set_last_context(ProgContext, !IO)
diff --git a/compiler/options.m b/compiler/options.m
index 1cc2553..234c112 100644
--- a/compiler/options.m
+++ b/compiler/options.m
@@ -1838,7 +1838,9 @@ option_defaults_2(link_option, [
     mkinit_erl_command                  -   string("mkinit_erl"),
     demangle_command                    -   string("mdemangle"),
     filtercc_command                    -   string("mfiltercc"),
-    filterjavac_command                 -   string("mfilterjavac"),
+    % XXX filterjavac_command is disabled until the addition of
+    % mfilterjavac has bootstrapped.
+    filterjavac_command                 -   string(""),
     trace_libs                          -   string(""),
     thread_libs                         -   string(""),
     hwloc_libs                          -   string(""),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20130423/f60f7e98/attachment.html>