Permalink
Browse files

Fix and enable the mfilterjavac option

Julien reported a bootstrap problem when mfilterjavac was enabled and a Java
grade was being installed but the installed compiler did not have an
mfilterjavac program.  When installing a Java grade the mfilterjavac program
in the workspace was not in the PATH.  This change ensures that mfilterjavac
is in the path and enables it's use in the compiler.

compiler/options.m:
    Enable the mfilterjavac option.

Mmakefile:
    Set the PATH in SUBDIR_MAKE and SUBSUBDIR_MAKE correctly so that the
    compiler can find mfilterjavac.

tools/bootcheck:
    Run 'mmake depend' in stage2/mfilterjavac in the same way that we do for
    the other directories.

mfilterjavac/.gitignore
    Ignore tags related files in this directory.
  • Loading branch information...
1 parent 3600ab8 commit d1f46923a06177da2a1f0bf2f953c9ce430ad356 @PaulBone PaulBone committed May 19, 2013
Showing with 15 additions and 11 deletions.
  1. +11 −7 Mmakefile
  2. +1 −3 compiler/options.m
  3. +2 −0 mfilterjavac/.gitignore
  4. +1 −1 tools/bootcheck
View
@@ -50,13 +50,17 @@ SUBDIRS = \
MMAKEFLAGS =
-SUBDIR_MMAKE = PATH=../scripts:../util:$$PATH \
- MMAKE_VPATH=. \
- MMAKE_DIR=../scripts \
- DESTDIR=$(DESTDIR) \
- ../scripts/mmake $(MMAKEFLAGS)
-
-SUBSUBDIR_MMAKE = PATH=../../scripts:../../util:$$PATH \
+# We include ../../mfilterjavac in this path because $SUBDIR_MMAKE is used
+# from the grade install directories, and we need mfilterjavac in our path
+# when executing in install_grade_dir.java/library and others.
+SUBDIR_MMAKE = \
+ PATH=../scripts:../util:../mfilterjavac:../../mfilterjavac:$$PATH \
+ MMAKE_VPATH=. \
+ MMAKE_DIR=../scripts \
+ DESTDIR=$(DESTDIR) \
+ ../scripts/mmake $(MMAKEFLAGS)
+
+SUBSUBDIR_MMAKE = PATH=../../scripts:../../util:../../mfilterjavac:$$PATH \
MMAKE_VPATH=. \
MMAKE_DIR=../../scripts \
DESTDIR=$(DESTDIR) \
View
@@ -1840,9 +1840,7 @@
mkinit_erl_command - string("mkinit_erl"),
demangle_command - string("mdemangle"),
filtercc_command - string("mfiltercc"),
- % XXX filterjavac_command is disabled until the addition of
- % mfilterjavac has bootstrapped.
- filterjavac_command - string(""),
+ filterjavac_command - string("mfilterjavac"),
trace_libs - string(""),
thread_libs - string(""),
hwloc_libs - string(""),
View
@@ -1,5 +1,7 @@
+.mfilterjavac_tags
MFILTERJAVAC_FLAGS
mfilterjavac
+tags
*.c
*.c_date
*.d
View
@@ -940,7 +940,7 @@ then
if (cd $stage2dir && \
$MMAKE $mmake_opts dep_library dep_mdbcomp \
dep_browser dep_ssdb dep_compiler \
- dep_slice dep_profiler dep_deep_profiler)
+ dep_slice dep_profiler dep_deep_profiler dep_mfilterjavac)
then
echo "building of stage 2 dependencies successful"
else

0 comments on commit d1f4692

Please sign in to comment.