diff options
author | Laurin-Luis Lehning <65224843+e820@users.noreply.github.com> | 2020-12-14 14:18:30 +0100 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-12-14 11:23:53 -0800 |
commit | 4164efceca7f0b91726e3e4258fe90aabaa5837e (patch) | |
tree | 0f1e8275561eae10e8a84d68e67f363d1f5523fa /mesonbuild/backend/ninjabackend.py | |
parent | 919278e3e1db85b4acc517e5614cc6c7b3163aa4 (diff) | |
download | meson-4164efceca7f0b91726e3e4258fe90aabaa5837e.zip meson-4164efceca7f0b91726e3e4258fe90aabaa5837e.tar.gz meson-4164efceca7f0b91726e3e4258fe90aabaa5837e.tar.bz2 |
Propagate Windows target checks up
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 1ec1af0..e643754 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2702,11 +2702,13 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) # If gui_app is significant on this platform, add the appropriate linker arguments. # Unfortunately this can't be done in get_target_type_link_args, because some misguided # libraries (such as SDL2) add -mwindows to their link flags. + m = self.environment.machines[target.for_machine] - if target.gui_app is not None: - commands += linker.get_gui_app_args(self.environment, target.gui_app) - else: - commands += linker.get_win_subsystem_args(self.environment, target.win_subsystem) + if m.is_windows() or m.is_cygwin(): + 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) return commands def get_link_whole_args(self, linker, target): |