mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-11 03:45:33 +00:00
Code Issues Projects Releases Wiki Activity

Use "msvc" rather than "cl" to identify MSVC.

Browse Source 
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.
This commit is contained in:
Julien Fischer
2011-10-26 05:50:19 +00:00
parent e16e1b8389
commit 4e0c95036c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/ml.in
View File

@@ -81,7 +81,7 @@ case "$CC" in
COMPILER=clang COMPILER=clang
;; ;;
*cl* | *CL*) *cl* | *CL*)
COMPILER=cl COMPILER=msvc
;; ;;
cc* | */cc*) cc* | */cc*)
COMPILER=cc COMPILER=cc
@@ -343,7 +343,7 @@ esac
# Determine whether to link the executable with debugging symbols when using # Determine whether to link the executable with debugging symbols when using
# MSVC. # MSVC.
if test $strip = "false" -a $COMPILER = "cl" if test $strip = "false" -a $COMPILER = "msvc"
then then
DEBUG_FLAG="-DEBUG" DEBUG_FLAG="-DEBUG"
else else
@@ -528,14 +528,20 @@ case $EXT_FOR_SHARED_LIB in
;; ;;
esac esac
case "$MKFIFO" in case "$MKFIFO" in
none) none)
demangle=false demangle=false
;; ;;
esac 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" LINKER_POST_FLAGS="@LINK_OPT_SEP@ $NODEFAULTLIB_FLAG $DEBUG_FLAG $LIBDIR_OPTS $RPATH_OPT_LIST $LIBS"
case $verbose in case $verbose in