aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/ui.py
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-09-16 16:10:06 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-11-02 21:39:02 +0200
commit4fc1ca20b6347190e6f525c85bdf20998ca7bc75 (patch)
treeaa54813c6ce56f878e6228f67aeef95aed6c91a8 /mesonbuild/dependencies/ui.py
parent26ff712bae08e8dfc76b3e424b0b5c2b61560158 (diff)
downloadmeson-4fc1ca20b6347190e6f525c85bdf20998ca7bc75.zip
meson-4fc1ca20b6347190e6f525c85bdf20998ca7bc75.tar.gz
meson-4fc1ca20b6347190e6f525c85bdf20998ca7bc75.tar.bz2
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
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
-rw-r--r--mesonbuild/dependencies/ui.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index 016eace..e3b371d 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -39,13 +39,13 @@ class GLDependency(ExternalDependency):
def __init__(self, environment, kwargs):
super().__init__('gl', environment, None, kwargs)
- if mesonlib.is_osx():
+ if mesonlib.for_darwin(self.want_cross, self.env):
self.is_found = True
# FIXME: Use AppleFrameworks dependency
self.link_args = ['-framework', 'OpenGL']
# FIXME: Detect version using self.clib_compiler
return
- if mesonlib.is_windows():
+ if mesonlib.for_windows(self.want_cross, self.env):
self.is_found = True
# FIXME: Use self.clib_compiler.find_library()
self.link_args = ['-lopengl32']