diff options
Diffstat (limited to 'modules/mono/config.py')
| -rw-r--r-- | modules/mono/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/mono/config.py b/modules/mono/config.py index 9a000a2a72..70fd1a35f1 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -83,6 +83,8 @@ def configure(env): mono_lib_names = ['mono-2.0-sgen', 'monosgen-2.0'] if env['platform'] == 'windows': + mono_root = '' + if bits == '32': if os.getenv('MONO32_PREFIX'): mono_root = os.getenv('MONO32_PREFIX') @@ -263,11 +265,13 @@ def pkgconfig_try_find_mono_root(mono_lib_names, sharedlib_ext): def pkgconfig_try_find_mono_version(): + from compat import decode_utf8 + lines = subprocess.check_output(['pkg-config', 'monosgen-2', '--modversion']).splitlines() greater_version = None for line in lines: try: - version = LooseVersion(line) + version = LooseVersion(decode_utf8(line)) if greater_version is None or version > greater_version: greater_version = version except ValueError: |