[m-rev.] diff: fix bugs with parallel mmake

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

Fix some problems with parallel mmake.

compiler/modules.m:
 	Apply a patch for provided by Keri Harris that fixes the dependencies
 	for .init files.  (We shouldn't generate the .init file until after
 	all the C files have been generated.)

 	Fix a similar problem with _init.c files.

Julien.

Index: compiler/modules.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.384.2.2
diff -u -r1.384.2.2 modules.m
--- compiler/modules.m	23 May 2006 06:46:52 -0000	1.384.2.2
+++ compiler/modules.m	16 Oct 2006 06:31:41 -0000
@@ -5240,9 +5240,9 @@

      module_name_to_file_name(ModuleName, ".dep", no, DepFileName, !IO),
      module_name_to_file_name(ModuleName, ".dv", no, DvFileName, !IO),
- 
+
      io.write_strings(DepStream, [
-        InitFileName, " : ", DepFileName, "\n",
+        InitFileName, " : ", DepFileName, " $(", MakeVarName, ".cs)\n",
          "\techo > ", InitFileName, "\n"
      ], !IO),

@@ -5266,7 +5266,7 @@
      TmpInitCFileName = InitCFileName ++ ".tmp",
      io.write_strings(DepStream, [
          ForceC2InitTarget, " :\n\n",
-        InitCFileName, " : ", ForceC2InitTarget, "\n",
+        InitCFileName, " : ", ForceC2InitTarget, " $(", MakeVarName, ".cs)\n",
          "\t@$(C2INIT) $(ALL_GRADEFLAGS) $(ALL_C2INITFLAGS) ",
              "--init-c-file ", TmpInitCFileName,
              " $(", MakeVarName, ".init_cs) $(ALL_C2INITARGS)\n",

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------