From 2169702a73a79bb6c6e96d00b62fe0e55dab764a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Fri, 9 Feb 2024 13:20:56 +0100 Subject: [PATCH] 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. --- mesonbuild/scripts/env2mfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py index 3fb9b8a9509d..2dfe6b05ef7d 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')