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/backend/backends.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/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 4d35d22..5b270d3 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -788,8 +788,7 @@ class Backend: deps = [os.path.join(self.build_to_src, df) for df in self.interpreter.get_build_def_files()] if self.environment.is_cross_build(): - deps.append(os.path.join(self.build_to_src, - self.environment.coredata.cross_file)) + deps.extend(self.environment.coredata.cross_files) deps.append('meson-private/coredata.dat') if os.path.exists(os.path.join(self.environment.get_source_dir(), 'meson_options.txt')): deps.append(os.path.join(self.build_to_src, 'meson_options.txt')) |