diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-08 21:25:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-08 21:25:25 +0300 |
commit | 761b28371a52ddb34457e15a801fd26b68e30381 (patch) | |
tree | 3ac51b036bdb953e39acb19a2f8e4371e3074ad6 /mesonbuild/backend/backends.py | |
parent | 664c2c909b35e8c37becf7bdfc948bf365a38e80 (diff) | |
parent | 27f5f0a9633b310f537f09ba0fdd79d86fcb962a (diff) | |
download | meson-761b28371a52ddb34457e15a801fd26b68e30381.zip meson-761b28371a52ddb34457e15a801fd26b68e30381.tar.gz meson-761b28371a52ddb34457e15a801fd26b68e30381.tar.bz2 |
Merge pull request #1518 from centricular/mesonintrospect-evar
Export MESONINTROSPECT to postconf/install/run_command scripts
Diffstat (limited to 'mesonbuild/backend/backends.py')
-rw-r--r-- | mesonbuild/backend/backends.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 80cf0ee..efc5bff 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -20,7 +20,8 @@ from .. import mlog from .. import compilers import json import subprocess -from ..mesonlib import MesonException, get_compiler_for_source, classify_unity_sources +from ..mesonlib import MesonException, get_meson_script +from ..mesonlib import get_compiler_for_source, classify_unity_sources from ..compilers import CompilerArgs class CleanTrees: @@ -33,7 +34,7 @@ class CleanTrees: self.trees = trees class InstallData: - def __init__(self, source_dir, build_dir, prefix, strip_bin): + def __init__(self, source_dir, build_dir, prefix, strip_bin, mesonintrospect): self.source_dir = source_dir self.build_dir = build_dir self.prefix = prefix @@ -46,6 +47,7 @@ class InstallData: self.po = [] self.install_scripts = [] self.install_subdirs = [] + self.mesonintrospect = mesonintrospect class ExecutableSerialisation: def __init__(self, name, fname, cmd_args, env, is_cross, exe_wrapper, @@ -714,7 +716,7 @@ 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')} child_env = os.environ.copy() child_env.update(env) |