diff options
author | Ting-Wei Lan <lantw@src.gnome.org> | 2021-07-11 00:08:09 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2021-08-29 08:36:59 -0400 |
commit | a70cdebfe7ac9e2ddbe26d604eaff3fe9bba691c (patch) | |
tree | 9c7b0da5e03b78df81bebd9e56e915a863ca0601 | |
parent | f407ad5d28f24755a19bb95495141db0ad9fe740 (diff) | |
download | meson-a70cdebfe7ac9e2ddbe26d604eaff3fe9bba691c.zip meson-a70cdebfe7ac9e2ddbe26d604eaff3fe9bba691c.tar.gz meson-a70cdebfe7ac9e2ddbe26d604eaff3fe9bba691c.tar.bz2 |
gnome: Prepend devenv, not append
Otherwise, if these environment variables already exist, they will
override values we set for the developer environment.
-rw-r--r-- | mesonbuild/modules/gnome.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index d148f45..5515919 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -507,11 +507,11 @@ class GnomeModule(ExtensionModule): return girtarget - def _devenv_append(self, varname: str, value: str) -> None: + def _devenv_prepend(self, varname: str, value: str) -> None: if self.devenv is None: self.devenv = build.EnvironmentVariables() self.interpreter.build.devenv.append(self.devenv) - self.devenv.append(varname, [value]) + self.devenv.prepend(varname, [value]) def _get_gir_dep(self, state): if not self.gir_dep: @@ -934,7 +934,7 @@ class GnomeModule(ExtensionModule): typelib_target = self._make_typelib_target(state, typelib_output, typelib_cmd, generated_files, kwargs) - self._devenv_append('GI_TYPELIB_PATH', os.path.join(state.environment.get_build_dir(), state.subdir)) + self._devenv_prepend('GI_TYPELIB_PATH', os.path.join(state.environment.get_build_dir(), state.subdir)) rv = [scan_target, typelib_target] @@ -958,7 +958,7 @@ class GnomeModule(ExtensionModule): else: targetname = 'gsettings-compile-' + state.subdir.replace('/', '_') target_g = build.CustomTarget(targetname, state.subdir, state.subproject, kwargs) - self._devenv_append('GSETTINGS_SCHEMA_DIR', os.path.join(state.environment.get_build_dir(), state.subdir)) + self._devenv_prepend('GSETTINGS_SCHEMA_DIR', os.path.join(state.environment.get_build_dir(), state.subdir)) return ModuleReturnValue(target_g, [target_g]) @permittedKwargs({'sources', 'media', 'symlink_media', 'languages'}) |