From 50fb7d37abc02b674b66071b51b1a2862fabb3cd Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Tue, 15 Aug 2017 20:05:56 +0300 Subject: Make all functionality invokable via the main Meson binary, which can be a Windows .exe file. --- mesonbuild/backend/backends.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mesonbuild/backend/backends.py') diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index f967de0..4dbf41c 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -20,10 +20,11 @@ from .. import mlog from .. import compilers import json import subprocess -from ..mesonlib import MesonException, get_meson_script +from ..mesonlib import MesonException from ..mesonlib import get_compiler_for_source, classify_unity_sources from ..compilers import CompilerArgs from collections import OrderedDict +import shlex class CleanTrees: ''' @@ -771,7 +772,8 @@ class Backend: def run_postconf_scripts(self): env = {'MESON_SOURCE_ROOT': self.environment.get_source_dir(), 'MESON_BUILD_ROOT': self.environment.get_build_dir(), - 'MESONINTROSPECT': get_meson_script(self.environment, 'mesonintrospect')} + 'MESONINTROSPECT': ' '.join([shlex.quote(x) for x in self.environment.get_build_command() + ['introspect']]), + } child_env = os.environ.copy() child_env.update(env) -- cgit v1.1