Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

backends: Don't hardcode system library paths 

Lookup the library paths using the available compilers instead.

This makes the code work on non-Linux platforms too.
This commit is contained in:
Nirbheek Chauhan 2018-06-05 17:50:12 +05:30 committed by Nirbheek Chauhan
parent e9462ce206
commit 6b7dba7f06
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mesonbuild/backend/backends.py
View File

@ -331,6 +331,13 @@ class Backend:
l, stdlib_args = target.get_clike_dynamic_linker_and_stdlibs() l, stdlib_args = target.get_clike_dynamic_linker_and_stdlibs()
return l, stdlib_args return l, stdlib_args
@staticmethod
def _libdir_is_system(libdir, compilers):
for cc in compilers.values():
if libdir in cc.get_library_dirs():
return True
return False
def rpaths_for_bundled_shared_libraries(self, target): def rpaths_for_bundled_shared_libraries(self, target):
paths = [] paths = []
for dep in target.external_deps: for dep in target.external_deps:
@ -341,20 +348,20 @@ class Backend:
continue continue
# The only link argument is an absolute path to a library file. # The only link argument is an absolute path to a library file.
libpath = la[0] libpath = la[0]
if libpath.startswith(('/usr/lib', '/lib')): libdir = os.path.dirname(libpath)
if self._libdir_is_system(libdir, target.compilers):
# No point in adding system paths. # No point in adding system paths.
continue continue
# Windows doesn't support rpaths, but we use this function to # Windows doesn't support rpaths, but we use this function to
# emulate rpaths by setting PATH, so also accept DLLs here # emulate rpaths by setting PATH, so also accept DLLs here
if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.so', '.dylib']: if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.so', '.dylib']:
continue continue
absdir = os.path.dirname(libpath) if libdir.startswith(self.environment.get_source_dir()):
if absdir.startswith(self.environment.get_source_dir()): rel_to_src = libdir[len(self.environment.get_source_dir()) + 1:]
rel_to_src = absdir[len(self.environment.get_source_dir()) + 1:]
assert not os.path.isabs(rel_to_src), 'rel_to_src: {} is absolute'.format(rel_to_src) assert not os.path.isabs(rel_to_src), 'rel_to_src: {} is absolute'.format(rel_to_src)
paths.append(os.path.join(self.build_to_src, rel_to_src)) paths.append(os.path.join(self.build_to_src, rel_to_src))
else: else:
paths.append(absdir) paths.append(libdir)
return paths return paths
def determine_rpath_dirs(self, target): def determine_rpath_dirs(self, target):