[gnome-continuous: 1/2] build: re-use build environ for the install command



commit 36091695df21e547816dedcf170a7cf90af53fbe
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Mon Jan 28 20:01:10 2019 +0100

    build: re-use build environ for the install command
    
    meson doesn't pass CC etc to g-ir-scanner and when the .gir is generated
    by "ninja install" then g-i falls back to the Python CC.
    
    Make sure we use the same env vars for the install command.

 src/ostree-build-compile-one | 2 --
 1 file changed, 2 deletions(-)
---
diff --git a/src/ostree-build-compile-one b/src/ostree-build-compile-one
index 58674f4..42a786a 100755
--- a/src/ostree-build-compile-one
+++ b/src/ostree-build-compile-one
@@ -277,10 +277,8 @@ def main(args):
 
     if use_make:
         args = ['make', 'install', 'DESTDIR=' + ostbuild_resultdir]
-        env = os.environ.copy()
     else:
         args = ['ninja', 'install']
-        env = os.environ.copy()
         env['DESTDIR'] = ostbuild_resultdir
 
     run_sync(args, cwd=builddir, env=env)


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