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

Force the use of static linkage with MSVC in the ml script.

Browse Source 
This fixes a problem that made it impossible to use mmake with MSVC.

scripts/ml.in:
     Force the use of static linkage with MSVC.
This commit is contained in:
Julien Fischer
2020-01-23 20:31:31 +11:00
parent ca58b4c2a4
commit 5a5ea709b9
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/ml.in
View File

@@ -2,7 +2,8 @@
# vim: ts=4 sw=4 noet # vim: ts=4 sw=4 noet
# @configure_input@ # @configure_input@
#---------------------------------------------------------------------------# #---------------------------------------------------------------------------#
# Copyright (C) 1995-2008, 2010-2011The University of Melbourne. # Copyright (C) 1995-2008, 2010-2011 The University of Melbourne.
# Copyright (C) 2013-2014, 2016, 2019-2020 The Mercury team.
# This file may only be copied under the terms of the GNU General # This file may only be copied under the terms of the GNU General
# Public License - see the file COPYING in the Mercury distribution. # Public License - see the file COPYING in the Mercury distribution.
#---------------------------------------------------------------------------# #---------------------------------------------------------------------------#
@@ -145,6 +146,15 @@ case $mercury_libs in
;; ;;
esac esac
# We cannot determine if we are using MSVC by looking at FULLARCH;
# we must use static linkage with it as we do not currently support
# the use of DLLs on Windows.
case "$C_COMPILER_TYPE" in
msvc*)
mercury_libs=static
;;
esac
# If you haven't set all_libs, set it to the default value # If you haven't set all_libs, set it to the default value
# (shared on most systems). # (shared on most systems).
case $all_libs in case $all_libs in
@@ -169,6 +179,12 @@ case $all_libs in
;; ;;
esac esac
case "$C_COMPILER_TYPE" in
msvc*)
all_libs=static
;;
esac
# Defaults have been set, now set options. # Defaults have been set, now set options.
case $all_libs in case $all_libs in