diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-20 18:46:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 18:46:32 +0200 |
| commit | f46b485fc2bee49c5fed763106136218bf0f82dc (patch) | |
| tree | 22fc770252d7403fab4170d1214262cc0ba541df /mesonbuild/environment.py | |
| parent | ac627bcea723b12e17822c18cccc9dbdeaee8b8f (diff) | |
| parent | a87b51f75cd81d89214c3ba6d36a3645b641b5aa (diff) | |
| download | meson-f46b485fc2bee49c5fed763106136218bf0f82dc.zip meson-f46b485fc2bee49c5fed763106136218bf0f82dc.tar.gz meson-f46b485fc2bee49c5fed763106136218bf0f82dc.tar.bz2 | |
Merge pull request #5083 from rossburton/crossfiles
Support multiple --cross-file options
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 58adb06..d0dccf4 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -408,12 +408,13 @@ 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', {})) - 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: |