diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-01-30 19:44:16 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-01-30 19:44:16 +0200 |
| commit | be9bf62cd7eb06d3c5f52970165e3c388b658b87 (patch) | |
| tree | 3f10b9b5e4c898dcacaba5ed7e29e65b08517cfd /environment.py | |
| parent | 2107be2a7803fb25421fb886df66006b93448667 (diff) | |
| download | meson-be9bf62cd7eb06d3c5f52970165e3c388b658b87.zip meson-be9bf62cd7eb06d3c5f52970165e3c388b658b87.tar.gz meson-be9bf62cd7eb06d3c5f52970165e3c388b658b87.tar.bz2 | |
Put /usr/local/lib ahead of /usr/lib in library search order.
Diffstat (limited to 'environment.py')
| -rw-r--r-- | environment.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/environment.py b/environment.py index a07d0be..b6998c5 100644 --- a/environment.py +++ b/environment.py @@ -566,7 +566,11 @@ def get_library_dirs(): if mesonlib.is_osx(): return ['/usr/lib'] # Fix me as well. # The following is probably Debian/Ubuntu specific. - unixdirs = ['/usr/lib', '/lib'] + # /usr/local/lib is first because it contains stuff + # installed by the sysadmin and is probably more up-to-date + # than /usr/lib. If you feel that this search order is + # problematic, please raise the issue on the mailing list. + unixdirs = ['/usr/local/lib', '/usr/lib', '/lib'] plat = subprocess.check_output(['uname', '-m']).decode().strip() # This is a terrible hack. I admit it and I'm really sorry. # I just don't know what the correct solution is. @@ -581,7 +585,6 @@ def get_library_dirs(): if os.path.exists('/lib64'): unixdirs.append('/lib64') unixdirs += glob('/lib/' + plat + '*') - unixdirs.append('/usr/local/lib') return unixdirs def get_args_from_envvars(lang): |