diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-07-12 11:34:19 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-07-14 10:26:46 -0700 |
| commit | 6eb1f2de031be04e2757b0d09784d5ada53d87f7 (patch) | |
| tree | 8d72ea98b56cde18052e951109cbc35b202c06aa | |
| parent | b9ddea245ef39fc29bd30a446c937058460c2196 (diff) | |
| download | meson-6eb1f2de031be04e2757b0d09784d5ada53d87f7.tar.gz | |
environment: allow setting build options with "build." prefix
This is allowed -- it is already deprecated for the cross file, but it should not
assert. Add a deprecation for the native file too, and remove the assert.
Fixes: d37d649b08b832d52fa684bc0506829fb40d5261
Fixes: #14789
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | mesonbuild/environment.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 2b79f02c0..a6783c50c 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -736,6 +736,8 @@ class Environment: if section_subproject: key = key.evolve(subproject=section_subproject) if machine == MachineChoice.BUILD: + if key.machine == MachineChoice.BUILD: + mlog.deprecation('Setting build machine options in the native file does not need the "build." prefix', once=True) return key.evolve(machine=machine) return key |