aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-11-30 22:18:25 +0200
committerGitHub <noreply@github.com>2017-11-30 22:18:25 +0200
commitcabbb30ab457e30084c8e125fe394c1801048b67 (patch)
tree8d8c55d110b72fe1b64fb493219b12f6af16621d /mesonbuild
parent1db319737dd472901be7880510fb7de8c5bd9dc2 (diff)
parent203c5ce9906238ec2d793fb321a7c5b113b43600 (diff)
downloadmeson-cabbb30ab457e30084c8e125fe394c1801048b67.zip
meson-cabbb30ab457e30084c8e125fe394c1801048b67.tar.gz
meson-cabbb30ab457e30084c8e125fe394c1801048b67.tar.bz2
Merge pull request #2668 from dcbaker/wip/macos-10.13-fixes
macos 10.13 fixes
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/dependencies/misc.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index e966597..41666a3 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -625,8 +625,10 @@ class Python3Dependency(ExternalDependency):
elif mesonlib.is_osx() and DependencyMethods.EXTRAFRAMEWORK in self.methods:
# In OSX the Python 3 framework does not have a version
# number in its name.
- fw = ExtraFrameworkDependency('python', False, None, self.env,
- self.language, kwargs)
+ # There is a python in /System/Library/Frameworks, but that's
+ # python 2, Python 3 will always bin in /Library
+ fw = ExtraFrameworkDependency(
+ 'python', False, '/Library/Frameworks', self.env, self.language, kwargs)
if fw.found():
self.compile_args = fw.get_compile_args()
self.link_args = fw.get_link_args()