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

Fix remaining soname and rpath issues on OSX

This commit is contained in:
GoaLitiuM 2018-09-06 04:18:56 +03:00
parent fd4c996a67
commit 040dd03a7a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mesonbuild/compilers/d.py
View File

@ -150,12 +150,15 @@ class DCompiler(Compiler):
def get_soname_args(self, *args): def get_soname_args(self, *args):
# FIXME: Make this work for cross-compiling # FIXME: Make this work for cross-compiling
gcc_type = GCC_STANDARD
if is_windows(): if is_windows():
gcc_type = GCC_CYGWIN return []
if is_osx(): elif is_osx():
gcc_type = GCC_OSX soname_args = get_gcc_soname_args(GCC_OSX, *args)
return get_gcc_soname_args(gcc_type, *args) if soname_args:
return ['-Wl,' + ','.join(soname_args)]
return []
return get_gcc_soname_args(GCC_STANDARD, *args)
def get_feature_args(self, kwargs, build_to_src): def get_feature_args(self, kwargs, build_to_src):
res = [] res = []
@ -230,7 +233,7 @@ class DCompiler(Compiler):
paths = padding paths = padding
else: else:
paths = paths + ':' + padding paths = paths + ':' + padding
return ['-Wl,-rpath={}'.format(paths)] return ['-Wl,-rpath,{}'.format(paths)]
def _get_compiler_check_args(self, env, extra_args, dependencies, mode='compile'): def _get_compiler_check_args(self, env, extra_args, dependencies, mode='compile'):
if extra_args is None: if extra_args is None: