From d57498a4fde13a04d56e7fc26199df2b10cbdf60 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 12 Aug 2018 14:31:31 +0100 Subject: Unconditionally use get_gui_app_args() Add get_gui_app_args() to the Compiler class so it can be unconditionally used --- mesonbuild/backend/ninjabackend.py | 5 ++--- mesonbuild/compilers/compilers.py | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index ba5c68ce7..9b718942f 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2234,9 +2234,8 @@ rule FORTRAN_DEP_HACK%s if isinstance(target, build.Executable): # Currently only used with the Swift compiler to add '-emit-executable' commands += linker.get_std_exe_link_args() - # If gui_app is significant on this platform - if hasattr(linker, 'get_gui_app_args'): - commands += linker.get_gui_app_args(target.gui_app) + # If gui_app is significant on this platform, add the appropriate linker arguments + commands += linker.get_gui_app_args(target.gui_app) # If export_dynamic, add the appropriate linker arguments if target.export_dynamic: commands += linker.gen_export_dynamic_link_args(self.environment) diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 381b995a7..97cca4779 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1076,6 +1076,9 @@ class Compiler: def gnu_symbol_visibility_args(self, vistype): return [] + def get_gui_app_args(self, value): + return [] + GCC_STANDARD = 0 GCC_OSX = 1 GCC_MINGW = 2 -- cgit v1.2.3