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 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mesonbuild/backend/ninjabackend.py') 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 -- cgit v1.1