diff options
| author | Niclas Zeising <zeising@daemonic.se> | 2019-02-01 16:21:52 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-20 21:44:40 +0200 |
| commit | 87d64b4632bd4ede0a21b81be1277538a4f4ed92 (patch) | |
| tree | 3c2626e8a7f290a57c54c0b6e8ef43dfa177c622 | |
| parent | b4ef2575939882c0824a63d63bdc423bc33943e8 (diff) | |
| download | meson-87d64b4632bd4ede0a21b81be1277538a4f4ed92.zip meson-87d64b4632bd4ede0a21b81be1277538a4f4ed92.tar.gz meson-87d64b4632bd4ede0a21b81be1277538a4f4ed92.tar.bz2 | |
Fix default_libdir() on FreeBSD
Fix defaul_libdir() on FreeBSD. The current behaviour of using
usr/lib64 if that exists is wrong on FreeBSD. The default should be to
always use usr/lib, even if usr/lib64 exists as a folder in the file
system. Fix this by checking if we're running on FreeBSD and then
always return 'lib' in default_libdir().
| -rw-r--r-- | mesonbuild/mesonlib.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index ee3366f..05b87e4 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -655,6 +655,8 @@ def default_libdir(): return 'lib/' + archpath except Exception: pass + if is_freebsd(): + return 'lib' if os.path.isdir('/usr/lib64') and not os.path.islink('/usr/lib64'): return 'lib64' return 'lib' |