[m-rev.] diff: quote argument to -install-name option

Julien Fischer juliensf at csse.unimelb.edu.au
Fri Dec 12 00:02:22 AEDT 2008


Fix a bug with mmc --make on Mac OS X.

compiler/file_util.m:
 	Quote the directory passed to the C compiler's
 	-install-name option in case it contains spaces.

compiler/make.program_target.m:
 	Update a comment.

Julien.

Index: compiler/file_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/file_util.m,v
retrieving revision 1.1
diff -u -r1.1 file_util.m
--- compiler/file_util.m	21 Jul 2008 03:10:07 -0000	1.1
+++ compiler/file_util.m	11 Dec 2008 12:57:03 -0000
@@ -195,7 +195,8 @@
      ;
          InstallNamePath = InstallNamePath0
      ),
-    InstallNameOpt = InstallNameFlag ++ InstallNamePath / OutputFileName.
+    InstallNameOpt = InstallNameFlag ++
+        quote_arg(InstallNamePath / OutputFileName).

  %-----------------------------------------------------------------------------%

Index: compiler/make.program_target.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make.program_target.m,v
retrieving revision 1.91
diff -u -r1.91 make.program_target.m
--- compiler/make.program_target.m	2 Sep 2008 09:44:07 -0000	1.91
+++ compiler/make.program_target.m	11 Dec 2008 12:57:03 -0000
@@ -1330,7 +1330,7 @@
      % the current grade.
      %
      % NOTE: changes here may require changes to
-    %       modules.get_install_name_option/4.
+    %       file_util.get_install_name_option/4.
      %
  :- pred install_library_grade_files(bool::in, string::in, module_name::in,
      list(module_name)::in, bool::out, make_info::in, make_info::out,

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



More information about the reviews mailing list