diff options
| author | Ross Burton <ross.burton@intel.com> | 2019-03-18 17:27:57 +0000 |
|---|---|---|
| committer | Ross Burton <ross.burton@intel.com> | 2019-03-20 10:06:17 +0000 |
| commit | 65e59c84a198062f21ab68fdae41b3e5de8d8480 (patch) | |
| tree | e0a081529b3ff4764f4f62a4ebc34722615971ee /mesonbuild/environment.py | |
| parent | d57dd1092e84e08ee15d7063b6c56bd6d864f2e1 (diff) | |
| download | meson-65e59c84a198062f21ab68fdae41b3e5de8d8480.zip meson-65e59c84a198062f21ab68fdae41b3e5de8d8480.tar.gz meson-65e59c84a198062f21ab68fdae41b3e5de8d8480.tar.bz2 | |
mesonbuild: allow multiple --cross-file options
Just like --native-file, allow multiple --cross-file options. This is mostly
unifying the logic between cross_files and config_files.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 92a00dd..d0dccf4 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -412,8 +412,9 @@ class Environment: self.binaries.build = BinaryTable(config.get('binaries', {})) self.paths.build = Directories(**config.get('paths', {})) - if self.coredata.cross_file is not None: - config = MesonConfigFile.parse_datafile(self.coredata.cross_file) + if self.coredata.cross_files: + config = MesonConfigFile.from_config_parser( + coredata.load_configs(self.coredata.cross_files, 'cross')) self.properties.host = Properties(config.get('properties', {}), False) self.binaries.host = BinaryTable(config.get('binaries', {}), False) if 'host_machine' in config: |