diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-02-12 20:04:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 20:04:23 +0200 |
| commit | 82e4cb7731e59237746e480f9611700f1d4fda76 (patch) | |
| tree | 24e8133c742258833badd29a03188cb72bb0e044 /mesonbuild/interpreter.py | |
| parent | ccdac894eedebfb49a90f87a3752cbcfeb28083e (diff) | |
| parent | 0eccce799f5643dda7a65f3e841cd54785f03ec5 (diff) | |
| download | meson-82e4cb7731e59237746e480f9611700f1d4fda76.zip meson-82e4cb7731e59237746e480f9611700f1d4fda76.tar.gz meson-82e4cb7731e59237746e480f9611700f1d4fda76.tar.bz2 | |
Merge pull request #4743 from dcbaker/native-file-extended
Extend native files to store install path information
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(): |