aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/backends.py
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-03-18 17:27:57 +0000
committerRoss Burton <ross.burton@intel.com>2019-03-20 10:06:17 +0000
commit65e59c84a198062f21ab68fdae41b3e5de8d8480 (patch)
treee0a081529b3ff4764f4f62a4ebc34722615971ee /mesonbuild/backend/backends.py
parentd57dd1092e84e08ee15d7063b6c56bd6d864f2e1 (diff)
downloadmeson-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/backend/backends.py')
-rw-r--r--mesonbuild/backend/backends.py3
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'))