diff options
| author | Jouni Kosonen <jouni.kosonen@tukesoft.com> | 2016-10-22 14:00:46 +0300 |
|---|---|---|
| committer | Jouni Kosonen <jouni.kosonen@tukesoft.com> | 2016-10-22 14:00:46 +0300 |
| commit | 1ed3317a8b875cfb042860c52a2feafd8d0b0dbd (patch) | |
| tree | 4f5580426ec4ff5bc64f31be84215de451223dc3 | |
| parent | 263cb6a5f0dcbffdf25e159b3bfa07988838aae9 (diff) | |
| download | meson-1ed3317a8b875cfb042860c52a2feafd8d0b0dbd.zip meson-1ed3317a8b875cfb042860c52a2feafd8d0b0dbd.tar.gz meson-1ed3317a8b875cfb042860c52a2feafd8d0b0dbd.tar.bz2 | |
Only default to dpkg-architecture output in Debian derivatives
| -rw-r--r-- | mesonbuild/mesonlib.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index abb5641..d47a4ee 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -165,15 +165,17 @@ def version_compare(vstr1, vstr2): return cmpop(varr1, varr2) def default_libdir(): - 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 is_debianlike(): + 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' |