[m-rev.] diff: fix failing mmc --make test

[Julien Fischer]

Estimated hours taken: 0.1
Branches: main

Fix a problem that was breaking the test cases for mmc --make on
x86 machines.

compiler/compile_target_code.m:
 	Don't include .picreg components in the grade specific .init
 	file installation directories when constructing the argument
 	list passed to mkinit.

Julien.

Index: compile_target_code.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/compile_target_code.m,v
retrieving revision 1.101
diff -u -r1.101 compile_target_code.m
--- compile_target_code.m	4 Dec 2006 00:54:03 -0000	1.101
+++ compile_target_code.m	19 Dec 2006 03:19:36 -0000
@@ -1087,16 +1087,17 @@
          TraceInitFileNamesList0, !IO),
      globals.io_lookup_maybe_string_option(
          mercury_standard_library_directory, MaybeStdLibDir, !IO),
+    grade_directory_component(Globals, GradeDir),
      (
          MaybeStdLibDir = yes(StdLibDir),
          InitFileNamesList1 = [
-            StdLibDir / "modules" / Grade / "mer_rt.init",
-            StdLibDir / "modules" / Grade / "mer_std.init" |
+            StdLibDir / "modules" / GradeDir / "mer_rt.init",
+            StdLibDir / "modules" / GradeDir / "mer_std.init" |
              InitFileNamesList0
          ],
          TraceInitFileNamesList = [
-            StdLibDir/"modules"/ Grade / "mer_browser.init",
-            StdLibDir/"modules"/ Grade / "mer_mdbcomp.init" |
+            StdLibDir/"modules"/ GradeDir / "mer_browser.init",
+            StdLibDir/"modules"/ GradeDir / "mer_mdbcomp.init" |
              TraceInitFileNamesList0
          ]
      ;

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------