diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-10 01:42:59 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-10 01:42:59 +0300 |
| commit | 28476aa719845094b20c9ebb58506da7b514b789 (patch) | |
| tree | 6e2fe7c6e6cf48f2f48f6b67f5473d5d0f81987f /mesonlib.py | |
| parent | 3f7f984a3910565887fcd530ed5c7323dd16708c (diff) | |
| download | meson-28476aa719845094b20c9ebb58506da7b514b789.zip meson-28476aa719845094b20c9ebb58506da7b514b789.tar.gz meson-28476aa719845094b20c9ebb58506da7b514b789.tar.bz2 | |
Pass gracefully if dpkg-architecture is not installed.
Diffstat (limited to 'mesonlib.py')
| -rw-r--r-- | mesonlib.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonlib.py b/mesonlib.py index cae5427..c04e7af 100644 --- a/mesonlib.py +++ b/mesonlib.py @@ -132,9 +132,11 @@ def version_compare(vstr1, vstr2): return cmpop(varr1, varr2) def default_libdir(): - if os.path.isfile('/etc/debian_version'): + try: archpath = subprocess.check_output(['dpkg-architecture', '-qDEB_HOST_MULTIARCH']).decode().strip() return 'lib/' + archpath + except FileNotFoundError: + pass if os.path.isdir('/usr/lib64'): return 'lib64' return 'lib' |