diff options
| author | Ignacio Roldán Etcheverry <neikeq@users.noreply.github.com> | 2019-11-12 14:57:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 14:57:29 +0100 |
| commit | 953f37f49b4d71b064935ff7e910bad829bfd17a (patch) | |
| tree | 98e14f915757284338675b5970812949d0d9303c /modules | |
| parent | 5bdb4827daca745e3c02c23b2214ff065ea83089 (diff) | |
| parent | cbd98d0fcf47201c116c89b757c900110932e352 (diff) | |
Merge pull request #33249 from JoshLee0915/MonoHeadlessServer
Added missing server platform checks to template dir and shared lib copy in mono_configure.py
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/build_scripts/mono_configure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index 4c1ebd8d74..c5c8b9adbd 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -262,7 +262,7 @@ def make_template_dir(env, mono_root): template_dir_name = '' - if platform in ['windows', 'osx', 'x11', 'android']: + if platform in ['windows', 'osx', 'x11', 'android', 'server']: template_dir_name = 'data.mono.%s.%s.%s' % (platform, env['bits'], target) else: assert False @@ -386,7 +386,7 @@ def copy_mono_shared_libs(env, mono_root, target_mono_root_dir): if platform == 'osx': # TODO: Make sure nothing is missing copy(os.path.join(mono_root, 'lib', 'libMonoPosixHelper.dylib'), target_mono_lib_dir) - elif platform == 'x11' or platform == 'android': + elif platform == 'x11' or platform == 'android' or platform == 'server': lib_file_names = [lib_name + '.so' for lib_name in [ 'libmono-btls-shared', 'libmono-ee-interp', 'libmono-native', 'libMonoPosixHelper', 'libmono-profiler-aot', 'libmono-profiler-coverage', 'libmono-profiler-log', 'libMonoSupportW' |