asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #34419 from akien-mga/mono-osx-copy-libs

Browse source 
Mono: Copy native and btls libs on macOS
This commit is contained in:
Rémi Verschelde 2019-12-18 13:28:44 +01:00 committed by GitHub
commit 589f27933d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/mono/build_scripts/mono_configure.py
View file

@ -446,18 +446,19 @@ def copy_mono_shared_libs(env, mono_root, target_mono_root_dir):
if not os.path.isdir(target_mono_lib_dir): if not os.path.isdir(target_mono_lib_dir):
os.makedirs(target_mono_lib_dir) os.makedirs(target_mono_lib_dir)
lib_file_names = []
if platform == 'osx': if platform == 'osx':
# TODO: Make sure nothing is missing lib_file_names = [lib_name + '.dylib' for lib_name in [
copy(os.path.join(mono_root, 'lib', 'libMonoPosixHelper.dylib'), target_mono_lib_dir) 'libmono-btls-shared', 'libmono-native-compat', 'libMonoPosixHelper'
]]
elif is_unix_like(platform): elif is_unix_like(platform):
lib_file_names = [lib_name + '.so' for lib_name in [ lib_file_names = [lib_name + '.so' for lib_name in [
'libmono-btls-shared', 'libmono-ee-interp', 'libmono-native', 'libMonoPosixHelper', 'libmono-btls-shared', 'libmono-ee-interp', 'libmono-native', 'libMonoPosixHelper',
'libmono-profiler-aot', 'libmono-profiler-coverage', 'libmono-profiler-log', 'libMonoSupportW' 'libmono-profiler-aot', 'libmono-profiler-coverage', 'libmono-profiler-log', 'libMonoSupportW'
]] ]]
for lib_file_name in lib_file_names: for lib_file_name in lib_file_names:
copy_if_exists(os.path.join(mono_root, 'lib', lib_file_name), target_mono_lib_dir) copy_if_exists(os.path.join(mono_root, 'lib', lib_file_name), target_mono_lib_dir)
def pkgconfig_try_find_mono_root(mono_lib_names, sharedlib_ext): def pkgconfig_try_find_mono_root(mono_lib_names, sharedlib_ext):
tmpenv = Environment() tmpenv = Environment()