From c9a7422cc1389c1ec51df34d8f96b83aeaf8b509 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 25 Sep 2016 11:13:00 +0530 Subject: dependencies/boost: Require BOOST_ROOT while cross-compiling Our fallback to the system-provided directories is never going to work while cross-compiling --- mesonbuild/dependencies.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'mesonbuild') diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index 106273c..f32e7ff 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -474,7 +474,12 @@ class BoostDependency(Dependency): def __init__(self, environment, kwargs): Dependency.__init__(self) self.name = 'boost' + self.environment = environment self.libdir = '' + if 'native' in kwargs and environment.is_cross_build(): + want_cross = not kwargs['native'] + else: + want_cross = environment.is_cross_build() try: self.boost_root = os.environ['BOOST_ROOT'] if not os.path.isabs(self.boost_root): @@ -482,6 +487,8 @@ class BoostDependency(Dependency): except KeyError: self.boost_root = None if self.boost_root is None: + if want_cross: + raise DependencyException('BOOST_ROOT is needed while cross-compiling') if mesonlib.is_windows(): self.boost_root = self.detect_win_root() self.incdir = self.boost_root -- cgit v1.1