[m-rev.] diff: --restricted-command-line and C#

Julien Fischer juliensf at csse.unimelb.edu.au
Thu Feb 16 04:11:39 AEDT 2012


Branches: main, 11.07

Fix a problem that prvents the compiler building in the csharp grade (with the
MS compiler) on MinGW/MSYS.

compiler/compile_target_code.m:
 	Optionally use @files when creating csharp exes or dlls.

Julien.

Index: compiler/compile_target_code.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/compile_target_code.m,v
retrieving revision 1.187
diff -u -r1.187 compile_target_code.m
--- compiler/compile_target_code.m	15 Feb 2012 16:58:54 -0000	1.187
+++ compiler/compile_target_code.m	15 Feb 2012 17:07:22 -0000
@@ -2876,8 +2876,8 @@

      get_mercury_std_libs(Globals, LinkTargetType, MercuryStdLibs),

-    Cmd = string.join_list(" ", [
-        CSharpCompiler,
+    Cmd = CSharpCompiler,
+    CmdArgs = string.join_list(" ", [
          HighLevelDataOpt,
          DebugOpt,
          TargetOption,
@@ -2887,8 +2887,8 @@
          MercuryStdLibs] ++
          CSCFlagsList ++
          SourceList),
-    invoke_system_command(Globals, ErrorStream, cmd_verbose_commands, Cmd,
-        Succeeded0, !IO),
+    invoke_long_system_command(Globals, ErrorStream, cmd_verbose_commands,
+        Cmd, CmdArgs, Succeeded0, !IO),

      % Also create a shell script to launch it if necessary.
      globals.get_target_env_type(Globals, TargetEnvType),

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