aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-01-19 15:46:05 -0500
committerNirbheek Chauhan <nirbheek@centricular.com>2023-02-19 02:55:56 +0530
commit6fcf56f38a130b07927ac8db215dd110450ffadd (patch)
tree041926598595863785073984dfad468d4c201484
parent9a7ef00716bc5e8825db92be7470a41dabbe7992 (diff)
downloadmeson-6fcf56f38a130b07927ac8db215dd110450ffadd.zip
meson-6fcf56f38a130b07927ac8db215dd110450ffadd.tar.gz
meson-6fcf56f38a130b07927ac8db215dd110450ffadd.tar.bz2
remove dead code
We shouldn't be hardcoding library dirs anyway. And we usually get this from the compiler. This function has been unused since its users were moved to use the compiler method, in the following commits: - a1a4f66e6d915c1f6aae2ead02cf5631b10c76f1 - a3856be1d50eaefe32fee5d3347d55d934d15b50 - 08224dafcba1b694fb624553e7d84deb565aae22
-rw-r--r--mesonbuild/utils/universal.py47
1 files changed, 0 insertions, 47 deletions
diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py
index a78ca7f..9fa0d51 100644
--- a/mesonbuild/utils/universal.py
+++ b/mesonbuild/utils/universal.py
@@ -94,7 +94,6 @@ __all__ = [
'generate_list',
'get_compiler_for_source',
'get_filenames_templates_dict',
- 'get_library_dirs',
'get_variable_regex',
'get_wine_shortpath',
'git',
@@ -986,52 +985,6 @@ def default_prefix() -> str:
return 'c:/' if is_windows() else '/usr/local'
-def get_library_dirs() -> T.List[str]:
- if is_windows():
- return ['C:/mingw/lib'] # TODO: get programmatically
- if is_osx():
- return ['/usr/lib'] # TODO: get programmatically
- # 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
- # 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']
-
- 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'}:
- plat = 'i386'
- elif machine.startswith('arm'):
- plat = 'arm'
- else:
- plat = ''
-
- # Solaris puts 32-bit libraries in the main /lib & /usr/lib directories
- # and 64-bit libraries in platform specific subdirectories.
- if is_sunos():
- if machine == 'i86pc':
- plat = 'amd64'
- elif machine.startswith('sun4'):
- plat = 'sparcv9'
-
- usr_platdir = Path('/usr/lib/') / plat
- if usr_platdir.is_dir():
- unixdirs += [str(x) for x in (usr_platdir).iterdir() if x.is_dir()]
- if os.path.exists('/usr/lib64'):
- unixdirs.append('/usr/lib64')
-
- lib_platdir = Path('/lib/') / plat
- if lib_platdir.is_dir():
- unixdirs += [str(x) for x in (lib_platdir).iterdir() if x.is_dir()]
- if os.path.exists('/lib64'):
- unixdirs.append('/lib64')
-
- return unixdirs
-
-
def has_path_sep(name: str, sep: str = '/\\') -> bool:
'Checks if any of the specified @sep path separators are in @name'
for each in sep: