[m-rev.] diff: avoid verbose output with ml script and MSVC

[Julien Fischer]

Branches: 11.07, main

scripts/ml.in:
 	Use "msvc" rather than "cl" to identify MSVC.  (The latter is
 	to easy to mistake for clang.)

 	When invoking the linker through MSVC, also invoke it with the
 	-nologo option.

Julien.

Index: scripts/ml.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/scripts/ml.in,v
retrieving revision 1.129
diff -u -r1.129 ml.in
--- scripts/ml.in	14 Oct 2011 00:25:06 -0000	1.129
+++ scripts/ml.in	26 Oct 2011 05:43:31 -0000
@@ -81,7 +81,7 @@
  		COMPILER=clang
  		;;
  	*cl* | *CL*)
-		COMPILER=cl
+		COMPILER=msvc
  		;;
  	cc* | */cc*)
  		COMPILER=cc
@@ -343,7 +343,7 @@

  # Determine whether to link the executable with debugging symbols when using
  # MSVC.
-if test $strip = "false" -a $COMPILER = "cl"
+if test $strip = "false" -a $COMPILER = "msvc"
  then
  	DEBUG_FLAG="-DEBUG"
  else
@@ -528,14 +528,20 @@
  		;;
  esac

-
  case "$MKFIFO" in
      none)
  		demangle=false
  		;;
  esac

-LINKER_PRE_FLAGS="$MSVCRT_OPTS $PRINT_MAP_OPT $UNDEF_OPT $STRIP_OPTS $MAYBE_STATIC_OPT $ARCH_OPTS"
+if test $COMPILER = "msvc"
+then
+	NOLOGO_OPTS="-nologo"
+else
+	NOLOGO_OPTS=""
+fi
+
+LINKER_PRE_FLAGS="$NOLOGO_OPTS $MSVCRT_OPTS $PRINT_MAP_OPT $UNDEF_OPT $STRIP_OPTS $MAYBE_STATIC_OPT $ARCH_OPTS"
  LINKER_POST_FLAGS="@LINK_OPT_SEP@ $NODEFAULTLIB_FLAG $DEBUG_FLAG $LIBDIR_OPTS $RPATH_OPT_LIST $LIBS"

  case $verbose in

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