From e83084fbfee22820b646627e35c5a1a6bf06f05c Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Tue, 28 May 2019 13:08:04 -0400 Subject: BUGFIX variable name #5285 handle x86 correctly --- mesonbuild/mesonlib.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mesonbuild/mesonlib.py') 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'): -- cgit v1.1