diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2024-03-06 14:10:08 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-03-10 13:09:32 -0700 |
| commit | f9479787a01106235e14d2a08a74352f4b1177ef (patch) | |
| tree | d46c28c64c07d8d11322e95ec0404cf8282b7088 /mesonbuild/interpreter/interpreter.py | |
| parent | 9e270f030f3016be2a419b698b8062e5ed5373b8 (diff) | |
| download | meson-f9479787a01106235e14d2a08a74352f4b1177ef.tar.gz | |
fix reconfigure subproject base options
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index e5a201e05..47d0d2d2d 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1506,7 +1506,7 @@ class Interpreter(InterpreterBase, HoldableObject): skip_sanity_check = self.should_skip_sanity_check(for_machine) if skip_sanity_check: mlog.log('Cross compiler sanity tests disabled via the cross file.', once=True) - comp = compilers.detect_compiler_for(self.environment, lang, for_machine, skip_sanity_check) + comp = compilers.detect_compiler_for(self.environment, lang, for_machine, skip_sanity_check, self.subproject) if comp is None: raise InvalidArguments(f'Tried to use unknown language "{lang}".') except mesonlib.MesonException: @@ -1520,7 +1520,7 @@ class Interpreter(InterpreterBase, HoldableObject): raise else: # update new values from commandline, if it applies - self.coredata.process_compiler_options(lang, comp, self.environment) + self.coredata.process_compiler_options(lang, comp, self.environment, self.subproject) # Add per-subproject compiler options. They inherit value from main project. if self.subproject: @@ -1529,7 +1529,7 @@ class Interpreter(InterpreterBase, HoldableObject): v = copy.copy(self.coredata.options[k]) k = k.evolve(subproject=self.subproject) options[k] = v - self.coredata.add_compiler_options(options, lang, for_machine, self.environment) + self.coredata.add_compiler_options(options, lang, for_machine, self.environment, self.subproject) if for_machine == MachineChoice.HOST or self.environment.is_cross_build(): logger_fun = mlog.log |