diff options
| author | John Ericson <git@JohnEricson.me> | 2019-04-15 01:23:10 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-06-05 23:05:34 -0400 |
| commit | af2d7af9983a04fa2dd6c073bdc41847a23012c8 (patch) | |
| tree | aa84b24acb247df40bc924557f92934e3e3776f3 /mesonbuild/dependencies/base.py | |
| parent | 126100b1666bfd75db37a0a9aaeee5dbfd11e53a (diff) | |
| download | meson-af2d7af9983a04fa2dd6c073bdc41847a23012c8.zip meson-af2d7af9983a04fa2dd6c073bdc41847a23012c8.tar.gz meson-af2d7af9983a04fa2dd6c073bdc41847a23012c8.tar.bz2 | |
Per machine do 'build.' and '' option prefixes
See the docs/ changes for details.
Diffstat (limited to 'mesonbuild/dependencies/base.py')
| -rw-r--r-- | mesonbuild/dependencies/base.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index a191f07..a6fb0b6 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -665,11 +665,12 @@ class PkgConfigDependency(ExternalDependency): else: env = env.copy() - if self.want_cross: - extra_paths = self.env.coredata.get_builtin_option('cross_pkg_config_path') + if not self.want_cross and self.env.is_cross_build(): + for_machine = MachineChoice.BUILD else: - extra_paths = self.env.coredata.get_builtin_option('pkg_config_path') + for_machine = MachineChoice.HOST + extra_paths = self.env.coredata.builtins_per_machine[for_machine]['pkg_config_path'].value new_pkg_config_path = ':'.join([p for p in extra_paths]) mlog.debug('PKG_CONFIG_PATH: ' + new_pkg_config_path) env['PKG_CONFIG_PATH'] = new_pkg_config_path @@ -1137,10 +1138,7 @@ class CMakeDependency(ExternalDependency): if cm_path: cm_args.append('-DCMAKE_MODULE_PATH=' + ';'.join(cm_path)) - if environment.is_cross_build() and self.want_cross: - pref_path = self.env.coredata.builtins['cross_cmake_prefix_path'].value - else: - pref_path = self.env.coredata.builtins['cmake_prefix_path'].value + pref_path = self.env.coredata.builtins_per_machine[for_machine]['cmake_prefix_path'].value if pref_path: cm_args.append('-DCMAKE_PREFIX_PATH={}'.format(';'.join(pref_path))) |