diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-07-14 19:50:05 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-07-14 15:44:27 -0700 |
| commit | 0376d655694747ba36aa2bfd94e5bce2d2f1efa8 (patch) | |
| tree | 13806872434b6a3889be4b01f2fbf1a8cacd6878 | |
| parent | 23e4901088cc4690d8ffbef9796421e42d77f5bd (diff) | |
| download | meson-0376d655694747ba36aa2bfd94e5bce2d2f1efa8.tar.gz | |
environment: really remove assertion
Fixes: #14789
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | mesonbuild/environment.py | 1 | ||||
| -rw-r--r-- | test cases/unit/69 cross/nativefile.in | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index a6783c50c..19e8b4e2e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -729,7 +729,6 @@ class Environment: def mfilestr2key(self, machine_file_string: str, section: T.Optional[str], section_subproject: T.Optional[str], machine: MachineChoice) -> OptionKey: key = OptionKey.from_string(machine_file_string) - assert key.machine == MachineChoice.HOST if key.subproject: suggestion = section if section == 'project options' else 'built-in options' raise MesonException(f'Do not set subproject options in [{section}] section, use [subproject:{suggestion}] instead.') diff --git a/test cases/unit/69 cross/nativefile.in b/test cases/unit/69 cross/nativefile.in index 054cf108d..9a639999d 100644 --- a/test cases/unit/69 cross/nativefile.in +++ b/test cases/unit/69 cross/nativefile.in @@ -1,2 +1,2 @@ [built-in options] -c_args = ['@c_args@'] +build.c_args = ['@c_args@'] |