diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-01-07 13:47:27 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-02-11 12:50:32 -0800 |
| commit | 5b896ed70bbf18e633bbeca442c90610e3d66a22 (patch) | |
| tree | 1205d983b474f4e97eb596769f410cc6ffc399d6 /mesonbuild/interpreter.py | |
| parent | b50899419cb2de27af34e5a955695a61c2863c51 (diff) | |
| download | meson-5b896ed70bbf18e633bbeca442c90610e3d66a22.zip meson-5b896ed70bbf18e633bbeca442c90610e3d66a22.tar.gz meson-5b896ed70bbf18e633bbeca442c90610e3d66a22.tar.bz2 | |
allow setting directory locations in a native file
This allows the person running configure (either a developer, user, or
distro maintainer) to keep a configuration of where various kinds of
files should end up.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 2eb0720..c03bae1 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2458,8 +2458,6 @@ external dependencies (including libraries) must go to "dependencies".''') return self.subprojects[dirname] def get_option_internal(self, optname): - # Some base options are not defined in some environments, return the - # default value from compilers.base_options in that case. for d in chain( [self.coredata.base_options, compilers.base_options, self.coredata.builtins], self.coredata.get_all_compiler_options()): @@ -2576,7 +2574,7 @@ external dependencies (including libraries) must go to "dependencies".''') default_options.update(self.default_project_options) else: default_options = {} - self.coredata.set_default_options(default_options, self.subproject, self.environment.cmd_line_options) + self.coredata.set_default_options(default_options, self.subproject, self.environment) self.set_backend() if not self.is_subproject(): |