diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2019-08-09 13:46:35 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-08-14 13:13:23 -0700 |
commit | 06dcbd50eea47b3182081527ea1c0ada01d4d847 (patch) | |
tree | 67a3ad1a5f2a78795edbe25851eecb7053306d2b /mesonbuild/build.py | |
parent | 2bd85c614a4c4c513b025680e23afb6697da95dd (diff) | |
download | meson-06dcbd50eea47b3182081527ea1c0ada01d4d847.zip meson-06dcbd50eea47b3182081527ea1c0ada01d4d847.tar.gz meson-06dcbd50eea47b3182081527ea1c0ada01d4d847.tar.bz2 |
compilers: Dispatch to dynamic linker class
Most of the cuda code is from Olexa Bilaniuk.
Most of the PGI code is from Michael Hirsc
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r-- | mesonbuild/build.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index b77995a..2f37670 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -28,7 +28,7 @@ from .mesonlib import ( extract_as_list, typeslistify, stringlistify, classify_unity_sources, get_filenames_templates_dict, substitute_values, has_path_sep, ) -from .compilers import Compiler, is_object, clink_langs, sort_clink, lang_suffixes, get_macos_dylib_install_name +from .compilers import Compiler, is_object, clink_langs, sort_clink, lang_suffixes from .linkers import StaticLinker from .interpreterbase import FeatureNew @@ -96,8 +96,12 @@ known_stlib_kwargs = known_build_target_kwargs | {'pic'} known_jar_kwargs = known_exe_kwargs | {'main_class'} @lru_cache(maxsize=None) -def get_target_macos_dylib_install_name(ld): - return get_macos_dylib_install_name(ld.prefix, ld.name, ld.suffix, ld.soversion) +def get_target_macos_dylib_install_name(ld) -> str: + name = ['@rpath/', ld.prefix, ld.name] + if ld.soversion is not None: + name.append('.' + ld.soversion) + name.append('.dylib') + return ''.join(name) class InvalidArguments(MesonException): pass |