[gnome-builder] pipeline: ensure launchers include environment from configuration



commit 85373f6b16c9ce693690e702a37c884f38b1b279
Author: Christian Hergert <chergert redhat com>
Date:   Fri Feb 24 17:26:27 2017 -0800

    pipeline: ensure launchers include environment from configuration
    
    The build configuration might have environment variables that we need to
    override in the build environment. Ensure those are passed to subprocess
    launchers.

 libide/buildsystem/ide-build-pipeline.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/libide/buildsystem/ide-build-pipeline.c b/libide/buildsystem/ide-build-pipeline.c
index b44deca..a947725 100644
--- a/libide/buildsystem/ide-build-pipeline.c
+++ b/libide/buildsystem/ide-build-pipeline.c
@@ -1869,7 +1869,10 @@ ide_build_pipeline_create_launcher (IdeBuildPipeline  *self,
 
   if (ret != NULL)
     {
+      IdeEnvironment *env = ide_configuration_get_environment (self->configuration);
+
       ide_subprocess_launcher_set_clear_env (ret, TRUE);
+      ide_subprocess_launcher_overlay_environment (ret, env);
       ide_subprocess_launcher_set_cwd (ret, ide_build_pipeline_get_builddir (self));
       ide_subprocess_launcher_set_flags (ret,
                                          (G_SUBPROCESS_FLAGS_STDERR_PIPE |


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]