diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-10-29 16:12:16 -0700 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-07-23 09:58:24 +0000 |
| commit | 5d7395673da102308ee03bab867fc46ff3e44e3a (patch) | |
| tree | 43215399267cb1091042717e75ac6ac54ac6f86f /mesonbuild/compilers | |
| parent | 24c4c079e7e4b94af9659299e730a6970eb8a648 (diff) | |
| download | meson-5d7395673da102308ee03bab867fc46ff3e44e3a.zip meson-5d7395673da102308ee03bab867fc46ff3e44e3a.tar.gz meson-5d7395673da102308ee03bab867fc46ff3e44e3a.tar.bz2 | |
compilers: return as-needed args as a list
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/gnu.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 4ab4dc6..417e0e9 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -360,7 +360,7 @@ def get_base_link_args(options, linker, is_shared_module): args.append('-Wl,-bitcode_bundle') elif as_needed: # -Wl,-dead_strip_dylibs is incompatible with bitcode - args.append(linker.get_asneeded_args()) + args.extend(linker.get_asneeded_args()) try: crt_val = options['b_vscrt'].value buildtype = options['buildtype'].value diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py index c575045..5647339 100644 --- a/mesonbuild/compilers/mixins/gnu.py +++ b/mesonbuild/compilers/mixins/gnu.py @@ -188,15 +188,15 @@ class GnuLikeCompiler(metaclass=abc.ABCMeta): # All GCC-like backends can do assembly self.can_compile_suffixes.add('s') - def get_asneeded_args(self) -> str: + def get_asneeded_args(self) -> typing.List[str]: # GNU ld cannot be installed on macOS # https://github.com/Homebrew/homebrew-core/issues/17794#issuecomment-328174395 # Hence, we don't need to differentiate between OS and ld # for the sake of adding as-needed support if self.compiler_type.is_osx_compiler: - return '-Wl,-dead_strip_dylibs' + return ['-Wl,-dead_strip_dylibs'] else: - return '-Wl,--as-needed' + return ['-Wl,--as-needed'] def get_pic_args(self) -> typing.List[str]: if self.compiler_type.is_osx_compiler or self.compiler_type.is_windows_compiler: |