diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-04-13 09:35:52 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-04-30 15:01:28 -0400 |
| commit | 18bec0d3e31884dc493a03741b2ec9fef17047ee (patch) | |
| tree | 664758d944e498fdb2e3d4eddd135325be7d3e85 /mesonbuild/modules | |
| parent | c08ee0f7bc310c9721247ba7398ec8f651ceac06 (diff) | |
| download | meson-18bec0d3e31884dc493a03741b2ec9fef17047ee.zip meson-18bec0d3e31884dc493a03741b2ec9fef17047ee.tar.gz meson-18bec0d3e31884dc493a03741b2ec9fef17047ee.tar.bz2 | |
pkgconfig: Use EnvironmentVariables to build PKG_CONFIG_* env
The new get_env() method that returns an EnvironmentVariables object
will be needed in next commit that will pass it to CustomTarget.
This has the side effect to use the proper os specific path separator
instead of hardcoding `:`. It is the obvious right thing to do here, but
has caused issues in the past. Hopefully issues have been fixed in the
meantime. If not, better deal with fallouts than keep doing the wrong
thing forever.
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/unstable_external_project.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py index d2c5b22..33a44d9 100644 --- a/mesonbuild/modules/unstable_external_project.py +++ b/mesonbuild/modules/unstable_external_project.py @@ -155,9 +155,8 @@ class ExternalProject(NewExtensionModule): self.run_env['LDFLAGS'] = self._quote_and_join(link_args) self.run_env = self.user_env.get_env(self.run_env) - - PkgConfigDependency.setup_env(self.run_env, self.env, MachineChoice.HOST, - Path(self.env.get_build_dir(), 'meson-uninstalled').as_posix()) + self.run_env = PkgConfigDependency.setup_env(self.run_env, self.env, MachineChoice.HOST, + uninstalled=True) self.build_dir.mkdir(parents=True, exist_ok=True) self._run('configure', configure_cmd, workdir) |