aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-07-20 22:53:26 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-07-20 22:53:26 +0300
commitb072d72f942065db6581f510fb226d3042d4f3bb (patch)
tree0c9020f3bcc245997cc369d5b3b2d993d3905684 /mesonbuild/environment.py
parent88aafd363e3b63184b42d66b9307ec701670b529 (diff)
downloadmeson-b072d72f942065db6581f510fb226d3042d4f3bb.zip
meson-b072d72f942065db6581f510fb226d3042d4f3bb.tar.gz
meson-b072d72f942065db6581f510fb226d3042d4f3bb.tar.bz2
Properties is no longer mandatory in cross files so do not require it.
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 98ce933..a105cb8 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -723,14 +723,12 @@ def get_args_from_envvars(lang):
class CrossBuildInfo():
def __init__(self, filename):
- self.config = {}
+ self.config = {'properties': {}}
self.parse_datafile(filename)
if 'target_machine' in self.config:
return
if not 'host_machine' in self.config:
raise mesonlib.MesonException('Cross info file must have either host or a target machine.')
- if not 'properties' in self.config:
- raise mesonlib.MesonException('Cross file is missing "properties".')
if not 'binaries' in self.config:
raise mesonlib.MesonException('Cross file is missing "binaries".')