From 3e1a610702adfec51a24a7dfdcba8a0319a795a1 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 22 May 2018 13:39:00 +0530 Subject: Add a new option for building with Apple bitcode support Normally, people would just pass -fembed-bitcode in CFLAGS, but this conflicts with -Wl,-dead_strip_dylibs and -bundle, so we need it as an option so that those can be quietly disabled. --- mesonbuild/backend/ninjabackend.py | 3 ++- mesonbuild/backend/vs2010backend.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 423c2ff..cd43b69 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2408,7 +2408,8 @@ rule FORTRAN_DEP_HACK%s commands += linker.gen_import_library_args(os.path.join(self.get_target_dir(target), target.import_filename)) elif isinstance(target, build.SharedLibrary): if isinstance(target, build.SharedModule): - commands += linker.get_std_shared_module_link_args() + options = self.environment.coredata.base_options + commands += linker.get_std_shared_module_link_args(options) else: commands += linker.get_std_shared_lib_link_args() # All shared libraries are PIC diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 09822ed..0ff7157 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -950,7 +950,8 @@ class Vs2010Backend(backends.Backend): self.generate_debug_information(link) if not isinstance(target, build.StaticLibrary): if isinstance(target, build.SharedModule): - extra_link_args += compiler.get_std_shared_module_link_args() + options = self.environment.coredata.base_options + extra_link_args += compiler.get_std_shared_module_link_args(options) # Add link args added using add_project_link_arguments() extra_link_args += self.build.get_project_link_args(compiler, target.subproject) # Add link args added using add_global_link_arguments() -- cgit v1.1