diff options
| author | Ole André Vadla Ravnås <oleavr@gmail.com> | 2024-02-09 13:20:56 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-02-23 08:57:04 -0800 |
| commit | 6cd2ba42fff771d958c535f6024d2887823c0d9f (patch) | |
| tree | 67915c8cf7ea282ae0b1691c52d5212b6435462c /mesonbuild/scripts/env2mfile.py | |
| parent | 20c9f3e621581b2ed9a1c6872b86c4dc9390aa6b (diff) | |
| download | meson-6cd2ba42fff771d958c535f6024d2887823c0d9f.tar.gz | |
env2mfile: move language args to `built-in options`
As putting them in the `properties` section is considered deprecated,
and Meson would then complain when trying to consume the resulting
machine file.
Diffstat (limited to 'mesonbuild/scripts/env2mfile.py')
| -rwxr-xr-x | mesonbuild/scripts/env2mfile.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py index 3fb9b8a95..2dfe6b05e 100755 --- a/mesonbuild/scripts/env2mfile.py +++ b/mesonbuild/scripts/env2mfile.py @@ -238,7 +238,7 @@ def write_machine_file(infos: MachineInfo, ofilename: str, write_system_info: bo write_args_line(ofile, exename, exe) ofile.write('\n') - ofile.write('[properties]\n') + ofile.write('[built-in options]\n') all_langs = list(set(infos.compile_args.keys()).union(set(infos.link_args.keys()))) all_langs.sort() for lang in all_langs: @@ -246,6 +246,9 @@ def write_machine_file(infos: MachineInfo, ofilename: str, write_system_info: bo write_args_line(ofile, lang + '_args', infos.compile_args[lang]) if lang in infos.link_args: write_args_line(ofile, lang + '_link_args', infos.link_args[lang]) + ofile.write('\n') + + ofile.write('[properties]\n') for k, v in infos.properties.items(): write_args_line(ofile, k, v) ofile.write('\n') |