diff options
| author | Ross Burton <ross.burton@intel.com> | 2019-03-18 16:16:56 +0000 |
|---|---|---|
| committer | Ross Burton <ross.burton@intel.com> | 2019-03-19 19:16:30 +0000 |
| commit | d57dd1092e84e08ee15d7063b6c56bd6d864f2e1 (patch) | |
| tree | e53a707db6159273faffc4a477885ac8812e1634 /mesonbuild/environment.py | |
| parent | 44dd5535f056922294867bac2eb07b57f21bede6 (diff) | |
| download | meson-d57dd1092e84e08ee15d7063b6c56bd6d864f2e1.zip meson-d57dd1092e84e08ee15d7063b6c56bd6d864f2e1.tar.gz meson-d57dd1092e84e08ee15d7063b6c56bd6d864f2e1.tar.bz2 | |
load_configs: generalise the search path
Instead of hard-coding the fact that load_configs() searches for files under
meson/native, pass in the subdirectory allowing the cross-file code to use the
same logic.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 58adb06..92a00dd 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -408,7 +408,7 @@ class Environment: if self.coredata.config_files is not None: config = MesonConfigFile.from_config_parser( - coredata.load_configs(self.coredata.config_files)) + coredata.load_configs(self.coredata.config_files, 'native')) self.binaries.build = BinaryTable(config.get('binaries', {})) self.paths.build = Directories(**config.get('paths', {})) |