Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ninjabackend: Rust use Backend.generate_basic_compiler_args 

Instead of open coding it. This simplifies things, and fixes some
missing functionality
This commit is contained in:
Dylan Baker 2021-05-17 11:50:22 -07:00
parent 6514abf681
commit 4f45b5937d
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mesonbuild/backend/ninjabackend.py
View File

@ -1691,20 +1691,12 @@ class NinjaBackend(backends.Backend):
if cratetype in {'bin', 'dylib'}: if cratetype in {'bin', 'dylib'}:
args.extend(rustc.get_linker_always_args()) args.extend(rustc.get_linker_always_args())
opt_proxy = self.get_compiler_options_for_target(target) args += self.generate_basic_compiler_args(target, rustc, False)
args += ['--crate-name', target.name] args += ['--crate-name', target.name]
args += rustc.get_buildtype_args(self.get_option_for_target(OptionKey('buildtype'), target))
args += rustc.get_debug_args(self.get_option_for_target(OptionKey('debug'), target))
args += rustc.get_optimization_args(self.get_option_for_target(OptionKey('optimization'), target))
args += rustc.get_option_compile_args(opt_proxy)
args += self.build.get_global_args(rustc, target.for_machine)
args += self.build.get_project_args(rustc, target.subproject, target.for_machine)
depfile = os.path.join(target.subdir, target.name + '.d') depfile = os.path.join(target.subdir, target.name + '.d')
args += ['--emit', f'dep-info={depfile}', '--emit', 'link'] args += ['--emit', f'dep-info={depfile}', '--emit', 'link']
args += target.get_extra_args('rust') args += target.get_extra_args('rust')
args += rustc.get_output_args(os.path.join(target.subdir, target.get_filename())) args += rustc.get_output_args(os.path.join(target.subdir, target.get_filename()))
args += self.environment.coredata.get_external_args(target.for_machine, rustc.language)
linkdirs = mesonlib.OrderedSet() linkdirs = mesonlib.OrderedSet()
external_deps = target.external_deps.copy() external_deps = target.external_deps.copy()
for d in target.link_targets: for d in target.link_targets: