diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-05-28 13:08:04 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-28 21:55:54 +0300 |
| commit | e83084fbfee22820b646627e35c5a1a6bf06f05c (patch) | |
| tree | fb3a12f0d5c4ff5f851d0f415d002d8c50c41cd7 /mesonbuild | |
| parent | 12a82e763d43f6280572b3f04357f77e50304855 (diff) | |
| download | meson-e83084fbfee22820b646627e35c5a1a6bf06f05c.zip meson-e83084fbfee22820b646627e35c5a1a6bf06f05c.tar.gz meson-e83084fbfee22820b646627e35c5a1a6bf06f05c.tar.bz2 | |
BUGFIX variable name #5285
handle x86 correctly
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/mesonlib.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index eb59a1c..ec4aa9f 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -770,9 +770,9 @@ def default_prefix(): def get_library_dirs() -> List[str]: if is_windows(): - return ['C:/mingw/lib'] # Fixme + return ['C:/mingw/lib'] # TODO: get programatically if is_osx(): - return ['/usr/lib'] # Fix me as well. + return ['/usr/lib'] # TODO: get programatically # The following is probably Debian/Ubuntu specific. # /usr/local/lib is first because it contains stuff # installed by the sysadmin and is probably more up-to-date @@ -788,6 +788,8 @@ def get_library_dirs() -> List[str]: plat = 'i386' elif machine.startswith('arm'): plat = 'arm' + else: + plat = '' unixdirs += [str(x) for x in (Path('/usr/lib/') / plat).iterdir() if x.is_dir()] if os.path.exists('/usr/lib64'): |