diff options
| author | Niclas Zeising <zeising@daemonic.se> | 2019-02-01 16:51:39 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-20 21:44:40 +0200 |
| commit | f85a71605d58e9b665e72ca43a60f0d04194a5e9 (patch) | |
| tree | 140446188b0171ee7a6dcb6b30afe9df9508a2b3 /mesonbuild/mesonlib.py | |
| parent | 87d64b4632bd4ede0a21b81be1277538a4f4ed92 (diff) | |
| download | meson-f85a71605d58e9b665e72ca43a60f0d04194a5e9.zip meson-f85a71605d58e9b665e72ca43a60f0d04194a5e9.tar.gz meson-f85a71605d58e9b665e72ca43a60f0d04194a5e9.tar.bz2 | |
Fix get_library_dirs() on FreeBSD
Fix get_library_dirs() on FreeBSD to only return /usr/local/lib,
/usr/lib and /lib as the default location to look for libraries.
FreeBSD does not use lib/${platform} or lib64 by default. In general,
those directories should not exist, but in case they do, ensure they're
not picked up.
Diffstat (limited to 'mesonbuild/mesonlib.py')
| -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 05b87e4..0afc21b 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -680,6 +680,8 @@ def get_library_dirs() -> List[str]: # problematic, please raise the issue on the mailing list. unixdirs = ['/usr/local/lib', '/usr/lib', '/lib'] + if is_freebsd(): + return unixdirs # FIXME: this needs to be further genericized for aarch64 etc. machine = platform.machine() if machine in ('i386', 'i486', 'i586', 'i686'): |