diff options
| author | matyalatte <matyalatte@gmail.com> | 2024-04-11 23:46:29 +0900 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-05-01 09:45:53 -0700 |
| commit | f1f24816a912bacbb32931bfbd034be36138e3e4 (patch) | |
| tree | 1f5ed576d6a9d54d1de0c090f0a221275dcd3900 /mesonbuild | |
| parent | e3db7af0ea41ea120f9d2dfedba309522575c5e7 (diff) | |
| download | meson-f1f24816a912bacbb32931bfbd034be36138e3e4.zip meson-f1f24816a912bacbb32931bfbd034be36138e3e4.tar.gz meson-f1f24816a912bacbb32931bfbd034be36138e3e4.tar.bz2 | |
use a for loop, check more linker options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 2e81008..91275c7 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -129,14 +129,6 @@ def get_non_primary_lang_intellisense_fields(vslite_ctx: dict, defs_paths_opts_per_lang_and_buildtype[src_lang][buildtype] = Vs2010Backend._extract_nmake_fields(args_list) return defs_paths_opts_per_lang_and_buildtype -# Returns if a target generates a manifest or not. -def get_gen_manifest(target): - if isinstance(target, build.BuildTarget): - upper_args = [arg.upper() for arg in target.link_args] - manifest_args = [arg for arg in upper_args if arg == '/MANIFEST' or arg.startswith('/MANIFEST:')] - return len(manifest_args) == 0 or manifest_args[-1] != '/MANIFEST:NO' - return True - class Vs2010Backend(backends.Backend): name = 'vs2010' @@ -706,7 +698,7 @@ class Vs2010Backend(backends.Backend): (root, type_config) = self.create_basic_project(target.name, temp_dir=target.get_id(), guid=guid, - gen_manifest=get_gen_manifest(target)) + gen_manifest=self.get_gen_manifest(target)) depend_files = self.get_target_depend_files(target) if not target.command: @@ -742,7 +734,7 @@ class Vs2010Backend(backends.Backend): temp_dir=target.get_id(), guid=guid, target_platform=platform, - gen_manifest=get_gen_manifest(target)) + gen_manifest=self.get_gen_manifest(target)) # We need to always use absolute paths because our invocation is always # from the target dir, not the build root. target.absolute_paths = True @@ -783,7 +775,7 @@ class Vs2010Backend(backends.Backend): temp_dir=target.get_id(), guid=guid, target_platform=platform, - gen_manifest=get_gen_manifest(target)) + gen_manifest=self.get_gen_manifest(target)) ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.targets') target.generated = [self.compile_target_to_generator(target)] target.sources = [] @@ -1616,7 +1608,7 @@ class Vs2010Backend(backends.Backend): conftype=conftype, target_ext=tfilename[1], target_platform=platform, - gen_manifest=get_gen_manifest(target)) + gen_manifest=self.get_gen_manifest(target)) generated_files, custom_target_output_files, generated_files_include_dirs = self.generate_custom_generator_commands( target, root) @@ -2095,3 +2087,25 @@ class Vs2010Backend(backends.Backend): def generate_lang_standard_info(self, file_args: T.Dict[str, CompilerArgs], clconf: ET.Element) -> None: pass + + # Returns if a target generates a manifest or not. + def get_gen_manifest(self, target): + if not isinstance(target, build.BuildTarget): + return True + + compiler = self._get_cl_compiler(target) + link_args = compiler.compiler_args() + if not isinstance(target, build.StaticLibrary): + link_args += self.build.get_project_link_args(compiler, target.subproject, target.for_machine) + link_args += self.build.get_global_link_args(compiler, target.for_machine) + link_args += self.environment.coredata.get_external_link_args( + target.for_machine, compiler.get_language()) + link_args += target.link_args + + for arg in reversed(link_args): + arg = arg.upper() + if arg == '/MANIFEST:NO': + return False + if arg == '/MANIFEST' or arg.startswith('/MANIFEST:'): + break + return True |