[m-rev.] trivial diff: fix `mmc --make' with `--pic-reg'

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main

compiler/compile_target_code.m:
	Use grade_directory_component rather than compute_grade when
	working out the directory names for the installed libraries.

Index: compile_target_code.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/compile_target_code.m,v
retrieving revision 1.37
diff -u -u -r1.37 compile_target_code.m
--- compile_target_code.m	11 Feb 2003 02:14:25 -0000	1.37
+++ compile_target_code.m	11 Feb 2003 23:43:38 -0000
@@ -1165,9 +1165,9 @@
 				MercuryLibDirs0),
 		globals__io_lookup_string_option(fullarch, FullArch),
 		globals__io_get_globals(Globals),
-		{ compute_grade(Globals, Grade) },
+		{ grade_directory_component(Globals, GradeDir) },
 		{ MercuryLibDirs = list__map(
-				(func(LibDir) = LibDir/"lib"/Grade/FullArch),
+				(func(LibDir) = LibDir/"lib"/GradeDir/FullArch),
 				MercuryLibDirs0) },
 		globals__io_lookup_accumulating_option(link_libraries,
 				LinkLibrariesList0),
@@ -1246,7 +1246,7 @@
 	globals__io_get_gc_method(GCMethod),
 	globals__io_lookup_string_option(library_extension, LibExt),
 	globals__io_get_globals(Globals),
-	{ compute_grade(Globals, Grade) },
+	{ grade_directory_component(Globals, GradeDir) },
 
 	%
 	% GC libraries.
@@ -1293,10 +1293,10 @@
 		{ SharedTraceLibs = "" }
 	;
 		{ StaticTraceLibs =
-			StdLibDir/"lib"/Grade/FullArch/
+			StdLibDir/"lib"/GradeDir/FullArch/
 				("libmer_trace" ++ LibExt) ++
 			" " ++
-			StdLibDir/"lib"/Grade/FullArch/
+			StdLibDir/"lib"/GradeDir/FullArch/
 				("libmer_browser" ++ LibExt) },
 		{ SharedTraceLibs = "-lmer_trace -lmer_browser" }
 	),
@@ -1305,8 +1305,8 @@
 	{ MercuryLinkage = "static" ->
 	    StdLibs = string__join_list(" ",
 		[StaticTraceLibs,
-		StdLibDir/"lib"/Grade/FullArch/("libmer_std" ++ LibExt),
-		StdLibDir/"lib"/Grade/FullArch/("libmer_rt" ++ LibExt),
+		StdLibDir/"lib"/GradeDir/FullArch/("libmer_std" ++ LibExt),
+		StdLibDir/"lib"/GradeDir/FullArch/("libmer_rt" ++ LibExt),
 		StaticGCLibs])
 	; MercuryLinkage = "shared" ->
 	    StdLibs = string__join_list(" ",
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------