[gnome-builder] meson: don't rely on builddir paths



commit 4f7f2774874bae15ac548127b2c630fa573d0b0f
Author: Christian Hergert <chergert redhat com>
Date:   Tue Feb 21 16:19:39 2017 -0800

    meson: don't rely on builddir paths
    
    The builddir may get remapped somewhere else in the build runtime. However
    we can rely on being in the builddir when the process is launched. So just
    use "." for current directory.

 plugins/meson/meson_plugin/__init__.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/plugins/meson/meson_plugin/__init__.py b/plugins/meson/meson_plugin/__init__.py
index a2904f7..62f6300 100644
--- a/plugins/meson/meson_plugin/__init__.py
+++ b/plugins/meson/meson_plugin/__init__.py
@@ -240,7 +240,9 @@ class MesonPipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
         config_launcher = pipeline.create_launcher()
         config_launcher.push_argv('meson')
         config_launcher.push_argv(srcdir)
-        config_launcher.push_argv(builddir)
+        # We will be launched from the builddir, so . is fine (as the directory
+        # may be mapped somewhere else in the build runtime).
+        config_launcher.push_argv('.')
         config_launcher.push_argv('--prefix={}'.format(config.props.prefix))
         config_opts = config.get_config_opts()
         if config_opts:


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