dependencies/boost: Require BOOST_ROOT while cross-compiling

Our fallback to the system-provided directories is never going to work
while cross-compiling
pull/814/head
Nirbheek Chauhan 8 years ago
parent bcf20af62e
commit c9a7422cc1
  1. 7
      mesonbuild/dependencies.py

@ -474,7 +474,12 @@ class BoostDependency(Dependency):
def __init__(self, environment, kwargs): def __init__(self, environment, kwargs):
Dependency.__init__(self) Dependency.__init__(self)
self.name = 'boost' self.name = 'boost'
self.environment = environment
self.libdir = '' self.libdir = ''
if 'native' in kwargs and environment.is_cross_build():
want_cross = not kwargs['native']
else:
want_cross = environment.is_cross_build()
try: try:
self.boost_root = os.environ['BOOST_ROOT'] self.boost_root = os.environ['BOOST_ROOT']
if not os.path.isabs(self.boost_root): if not os.path.isabs(self.boost_root):
@ -482,6 +487,8 @@ class BoostDependency(Dependency):
except KeyError: except KeyError:
self.boost_root = None self.boost_root = None
if self.boost_root is None: if self.boost_root is None:
if want_cross:
raise DependencyException('BOOST_ROOT is needed while cross-compiling')
if mesonlib.is_windows(): if mesonlib.is_windows():
self.boost_root = self.detect_win_root() self.boost_root = self.detect_win_root()
self.incdir = self.boost_root self.incdir = self.boost_root

Loading…
Cancel
Save