[m-rev.] for review: LD_LIBFLAGS and mmc --make

[Peter Wang]

Estimated hours taken: 0.5
Branches: main

compiler/options_file.m:
	Fix an oversight that caused `mmc --make' to not use LD_LIBFLAGS
	settings from Mercury.options files when making shared libraries.

compiler/options.m:
	Fix a spelling mistake in the usage message.

doc/user_guide.texi:
	Mention that MLFLAGS has no effect with `mmc --make'.


Index: compiler/options.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/options.m,v
retrieving revision 1.543
diff -u -r1.543 options.m
--- compiler/options.m	8 Jan 2007 03:03:14 -0000	1.543
+++ compiler/options.m	15 Jan 2007 01:34:55 -0000
@@ -4502,7 +4502,7 @@
         "\t(The default executable name is the same as the name",
         "\tof the first module on the command line.)",
         "\tThis option is ignored by `mmc --make'.",
-        "--ld-flags <options>, --ld-flags <option>",
+        "--ld-flags <options>, --ld-flag <option>",
         "\tSpecify options to be passed to the linker command",
         "\tinvoked by ml to link an executable.",
         "\tUse `ml --print-link-command' to find out which",
Index: compiler/options_file.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/options_file.m,v
retrieving revision 1.43
diff -u -r1.43 options_file.m
--- compiler/options_file.m	16 Dec 2006 12:36:57 -0000	1.43
+++ compiler/options_file.m	15 Jan 2007 01:34:55 -0000
@@ -901,7 +901,7 @@
 options_variable_types =
     [grade_flags, linkage, mercury_linkage, lib_grades, lib_linkages,
     stdlib_dir, config_dir, mmc_flags, c_flags, java_flags, ilasm_flags,
-    csharp_flags, mcpp_flags, ml_objs, lib_dirs, ld_flags,
+    csharp_flags, mcpp_flags, ml_objs, lib_dirs, ld_flags, ld_libflags,
     libraries, ml_libs, c2init_args, install_prefix].
 
 :- func options_variable_name(options_variable_type) = string.
Index: doc/user_guide.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/user_guide.texi,v
retrieving revision 1.505
diff -u -r1.505 user_guide.texi
--- doc/user_guide.texi	3 Jan 2007 05:17:13 -0000	1.505
+++ doc/user_guide.texi	15 Jan 2007 01:35:02 -0000
@@ -700,6 +700,7 @@
 Options to pass to the ml and c2init scripts.
 (Note that compilation model options should be
 specified in @code{GRADEFLAGS}, not in @code{MLFLAGS}.)
+These variables have no effect with @samp{mmc --make}.
 
 @item LDFLAGS and EXTRA_LDFLAGS
 @vindex LDFLAGS
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------