diff options
author | Benjamin Redelings <benjamin.redelings@gmail.com> | 2018-02-07 21:51:48 -0500 |
---|---|---|
committer | Benjamin Redelings <benjamin.redelings@gmail.com> | 2018-02-07 22:03:02 -0500 |
commit | a47a521b50bb9f705e8fa9476e47ac96d11a010d (patch) | |
tree | 9f0cfb67b5557b195cfa2127554532832c5b059f | |
parent | 632d12f2810b9ee6bb494ad554626fc5abe47835 (diff) | |
download | meson-a47a521b50bb9f705e8fa9476e47ac96d11a010d.zip meson-a47a521b50bb9f705e8fa9476e47ac96d11a010d.tar.gz meson-a47a521b50bb9f705e8fa9476e47ac96d11a010d.tar.bz2 |
Correctly check for cross-compilation.
-rw-r--r-- | mesonbuild/dependencies/misc.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 078b469..20c12d7 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -131,7 +131,7 @@ class BoostDependency(ExternalDependency): self.libdir = os.environ['BOOST_LIBRARYDIR'] if self.boost_root is None: - if mesonlib.is_windows(): + if mesonlib.for_windows(self.want_cross, self.env): self.boost_roots = self.detect_win_roots() else: self.boost_roots = self.detect_nix_roots() @@ -141,12 +141,12 @@ class BoostDependency(ExternalDependency): return if self.incdir is None: - if mesonlib.is_windows(): + if mesonlib.for_windows(self.want_cross, self.env): self.incdir = self.detect_win_incdir() else: self.incdir = self.detect_nix_incdir() - if self.incdir is None and mesonlib.is_windows(): + if self.incdir is None and mesonlib.for_windows(self.want_cross, self.env): self.log_fail() return @@ -289,7 +289,7 @@ class BoostDependency(ExternalDependency): self.is_found = True def detect_lib_modules(self): - if mesonlib.is_windows(): + if mesonlib.for_windows(self.want_cross, self.env): return self.detect_lib_modules_win() return self.detect_lib_modules_nix() @@ -417,7 +417,7 @@ class BoostDependency(ExternalDependency): if self.static: libsuffix = 'a' - elif mesonlib.is_osx() and not self.want_cross: + elif mesonlib.for_darwin(self.want_cross, self.env): libsuffix = 'dylib' else: libsuffix = 'so' |