diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-04 15:48:54 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-04-05 15:08:17 -0700 |
commit | 91b2475e30d7659dad24eb35b47e4d098c716792 (patch) | |
tree | bbc5ec4d59ece1fcc44e658832b8b36351f7c072 | |
parent | 377b652b93c8961bdcb266ba4254a15b28f2c5be (diff) | |
download | meson-91b2475e30d7659dad24eb35b47e4d098c716792.zip meson-91b2475e30d7659dad24eb35b47e4d098c716792.tar.gz meson-91b2475e30d7659dad24eb35b47e4d098c716792.tar.bz2 |
dependencies/pkg-config: Add support for different cross_flags
-rw-r--r-- | mesonbuild/dependencies/base.py | 5 | ||||
-rwxr-xr-x | run_unittests.py | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 94a6a6b..1787f1f 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -616,7 +616,10 @@ class PkgConfigDependency(ExternalDependency): else: env = env.copy() - extra_paths = self.env.coredata.get_builtin_option('pkg_config_path') + if self.want_cross: + extra_paths = self.env.coredata.get_builtin_option('cross_pkg_config_path') + else: + extra_paths = self.env.coredata.get_builtin_option('pkg_config_path') env['PKG_CONFIG_PATH'] = ':'.join([p for p in extra_paths]) fenv = frozenset(env.items()) targs = tuple(args) diff --git a/run_unittests.py b/run_unittests.py index 34307f6..97e5ef4 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -5169,6 +5169,11 @@ class LinuxCrossMingwTests(BasePlatformTests): # Must run in-process or we'll get a generic CalledProcessError self.run_tests(inprocess=True) + @skipIfNoPkgconfig + def test_cross_pkg_config_option(self): + testdir = os.path.join(self.unit_test_dir, '55 pkg_config_path option') + self.init(testdir, extra_args=['-Dcross_pkg_config_path=' + os.path.join(testdir, 'extra_path')]) + class PythonTests(BasePlatformTests): ''' |