diff options
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 4 | ||||
| -rw-r--r-- | mesonbuild/linkers/linkers.py | 10 | ||||
| -rw-r--r-- | unittests/linuxliketests.py | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 668455b4d..62897b101 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -3455,7 +3455,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) commands += linker.get_std_exe_link_args() # If export_dynamic, add the appropriate linker arguments if target.export_dynamic: - commands += linker.gen_export_dynamic_link_args(self.environment) + commands += linker.gen_export_dynamic_link_args() # If implib, and that's significant on this platform (i.e. Windows using either GCC or Visual Studio) if target.import_filename: commands += linker.gen_import_library_args(self.get_import_filename(target)) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 428f6f7af..10424ba82 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -260,8 +260,8 @@ class CLikeCompiler(Compiler): def get_default_include_dirs(self) -> T.List[str]: return [] - def gen_export_dynamic_link_args(self, env: 'Environment') -> T.List[str]: - return self.linker.export_dynamic_args(env) + def gen_export_dynamic_link_args(self) -> T.List[str]: + return self.linker.export_dynamic_args() def gen_import_library_args(self, implibname: str) -> T.List[str]: return self.linker.import_library_args(implibname) diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py index 6122db9d8..1d61f4a4b 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py @@ -262,7 +262,7 @@ class DynamicLinker(metaclass=abc.ABCMeta): def get_search_args(self, dirname: str) -> T.List[str]: pass - def export_dynamic_args(self, env: 'Environment') -> T.List[str]: + def export_dynamic_args(self) -> T.List[str]: return [] def import_library_args(self, implibname: str) -> T.List[str]: @@ -696,8 +696,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): def get_coverage_args(self) -> T.List[str]: return ['--coverage'] - def export_dynamic_args(self, env: 'Environment') -> T.List[str]: - m = env.machines[self.for_machine] + def export_dynamic_args(self) -> T.List[str]: + m = self.environment.machines[self.for_machine] if m.is_windows() or m.is_cygwin(): return self._apply_prefix('--export-all-symbols') return self._apply_prefix('-export-dynamic') @@ -932,7 +932,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): # https://clang.llvm.org/docs/CommandGuide/clang.html#cmdoption-flto return ["-Wl,-object_path_lto," + path] - def export_dynamic_args(self, env: 'Environment') -> T.List[str]: + def export_dynamic_args(self) -> T.List[str]: if mesonlib.version_compare(self.version, '>=224.1'): return self._apply_prefix('-export_dynamic') return [] @@ -1278,7 +1278,7 @@ class ArmClangDynamicLinker(ArmDynamicLinker): extends a few things as needed. """ - def export_dynamic_args(self, env: 'Environment') -> T.List[str]: + def export_dynamic_args(self) -> T.List[str]: return ['--export_dynamic'] def import_library_args(self, implibname: str) -> T.List[str]: diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 15bb36b91..a97a1f106 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1523,7 +1523,7 @@ class LinuxlikeTests(BasePlatformTests): env = get_fake_env() cc = detect_c_compiler(env, MachineChoice.HOST) linker = cc.linker - if not linker.export_dynamic_args(env): + if not linker.export_dynamic_args(): raise SkipTest('Not applicable for linkers without --export-dynamic') self.init(testdir) build_ninja = os.path.join(self.builddir, 'build.ninja') |