Fix incorrect checking of build machine for dependency availability

Don't check the build machine to determine a dependency whose availability
is static property of the host machine
pull/4394/merge
Jon Turney 6 years ago committed by Jussi Pakkanen
parent 26ff712bae
commit 4fc1ca20b6
  1. 2
      mesonbuild/dependencies/platform.py
  2. 4
      mesonbuild/dependencies/ui.py

@ -33,7 +33,7 @@ class AppleFrameworks(ExternalDependency):
for f in self.frameworks: for f in self.frameworks:
self.link_args += ['-framework', f] self.link_args += ['-framework', f]
self.is_found = mesonlib.is_osx() self.is_found = mesonlib.for_darwin(self.want_cross, self.env)
def log_tried(self): def log_tried(self):
return 'framework' return 'framework'

@ -39,13 +39,13 @@ class GLDependency(ExternalDependency):
def __init__(self, environment, kwargs): def __init__(self, environment, kwargs):
super().__init__('gl', environment, None, kwargs) super().__init__('gl', environment, None, kwargs)
if mesonlib.is_osx(): if mesonlib.for_darwin(self.want_cross, self.env):
self.is_found = True self.is_found = True
# FIXME: Use AppleFrameworks dependency # FIXME: Use AppleFrameworks dependency
self.link_args = ['-framework', 'OpenGL'] self.link_args = ['-framework', 'OpenGL']
# FIXME: Detect version using self.clib_compiler # FIXME: Detect version using self.clib_compiler
return return
if mesonlib.is_windows(): if mesonlib.for_windows(self.want_cross, self.env):
self.is_found = True self.is_found = True
# FIXME: Use self.clib_compiler.find_library() # FIXME: Use self.clib_compiler.find_library()
self.link_args = ['-lopengl32'] self.link_args = ['-lopengl32']

Loading…
Cancel
Save