From f2d669f5d33ee42d22ee5506b131ef9ab91e2edd Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Fri, 1 Jun 2018 21:45:21 +0200 Subject: Fix Mono static linking on Mingw --- modules/mono/config.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/mono/config.py b/modules/mono/config.py index 3afb8a8892..8b52d77f80 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -80,7 +80,11 @@ def configure(env): if mono_static: lib_suffix = Environment()['LIBSUFFIX'] - mono_static_lib_name = 'libmono-static-sgen' + + if env.msvc: + mono_static_lib_name = 'libmono-static-sgen' + else: + mono_static_lib_name = 'libmonosgen-2.0' if not os.path.isfile(os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)): raise RuntimeError('Could not find static mono library in: ' + mono_lib_path) @@ -93,7 +97,10 @@ def configure(env): env.Append(LINKFLAGS='LIBCMT' + lib_suffix) env.Append(LINKFLAGS='Psapi' + lib_suffix) else: - env.Append(LIBS=mono_static_lib_name) + env.Append(LINKFLAGS=os.path.join(mono_lib_path, mono_static_lib_name + lib_suffix)) + + env.Append(LIBS='psapi') + env.Append(LIBS='version') else: mono_lib_name = find_file_in_dir(mono_lib_path, mono_lib_names, extension='.lib') -- cgit v1.2.3