diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-02-21 13:04:31 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-02-21 13:04:31 +0200 |
| commit | f74d6201eb1bd36f666604fa301922b5183ef14e (patch) | |
| tree | fc6cbbfbe6b74f337a1a0fa70069af866ff4a66f | |
| parent | 9463c5965e859b8a9686ee1eaa7bfed8fd4bccc6 (diff) | |
| download | meson-f74d6201eb1bd36f666604fa301922b5183ef14e.zip meson-f74d6201eb1bd36f666604fa301922b5183ef14e.tar.gz meson-f74d6201eb1bd36f666604fa301922b5183ef14e.tar.bz2 | |
Guard against ALL THE THINGS!
| -rw-r--r-- | mesonbuild/mesonlib.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index 8244f0c..a20ddf0 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -160,12 +160,15 @@ def version_compare(vstr1, vstr2): return cmpop(varr1, varr2) def default_libdir(): - pc = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'], - stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) - (stdo, _) = pc.communicate() - if pc.returncode == 0: - archpath = stdo.decode().strip() - return 'lib/' + archpath + try: + pc = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'], + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) + (stdo, _) = pc.communicate() + if pc.returncode == 0: + archpath = stdo.decode().strip() + return 'lib/' + archpath + except Exception: + pass if os.path.isdir('/usr/lib64'): return 'lib64' return 'lib' |