diff options
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 4 | ||||
| -rw-r--r-- | mesonbuild/linkers.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 71deab0..9193dfc 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2705,7 +2705,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) if target.gui_app is not None: commands += linker.get_gui_app_args(target.gui_app) else: - commands += linker.get_win_subsystem_args(target.win_subsystem) + commands += linker.get_win_subsystem_args(self.environment, target.win_subsystem) return commands def get_link_whole_args(self, linker, target): diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index ec255a8..b1452b2 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -873,11 +873,11 @@ class Compiler(metaclass=abc.ABCMeta): def get_gui_app_args(self, value: bool) -> T.List[str]: return [] - def get_win_subsystem_args(self, value: str) -> T.List[str]: + def get_win_subsystem_args(self, env: 'Environment', value: str) -> T.List[str]: # By default the dynamic linker is going to return an empty # array in case it either doesn't support Windows subsystems # or does not target Windows - return self.linker.get_win_subsystem_args(value) + return self.linker.get_win_subsystem_args(env, value) def has_func_attribute(self, name: str, env: 'Environment') -> T.Tuple[bool, bool]: raise EnvironmentException( diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 9ad4a28..0d0ac53 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -477,7 +477,7 @@ class DynamicLinker(LinkerEnvVarsMixin, metaclass=abc.ABCMeta): # Only used by the Apple linker return [] - def get_win_subsystem_args(self, value: str) -> T.List[str]: + def get_win_subsystem_args(self, env: 'Environment', value: str) -> T.List[str]: # Only used if supported by the dynamic linker and # only when targeting Windows return [] @@ -748,7 +748,7 @@ class GnuDynamicLinker(GnuLikeDynamicLinkerMixin, PosixDynamicLinkerMixin, Dynam """Representation of GNU ld.bfd and ld.gold.""" - def get_win_subsystem_args(self, value: str) -> T.List[str]: + def get_win_subsystem_args(self, env: 'Environment', value: str) -> T.List[str]: m = env.machines[self.for_machine] args = [] @@ -802,7 +802,7 @@ class LLVMDynamicLinker(GnuLikeDynamicLinkerMixin, PosixDynamicLinkerMixin, Dyna return self._apply_prefix('--allow-shlib-undefined') return [] - def get_win_subsystem_args(self, value: str) -> T.List[str]: + def get_win_subsystem_args(self, env: 'Environment', value: str) -> T.List[str]: m = env.machines[self.for_machine] if not m.is_windows() or m.is_cygwin(): return [] |