diff options
| author | Aleksey Gurtovoy <agurtovoy@acm.org> | 2019-11-01 15:24:58 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-11-02 16:16:09 +0200 |
| commit | 48e6db89ab702c0f7c0fb8b9cbcac857dce9c6ef (patch) | |
| tree | bbc4f72a5b06176f5eeb20cf6a3b8e2abea73d70 /mesonbuild/environment.py | |
| parent | 025e11c9a72f313c6fa667e085b1de0e55a38781 (diff) | |
| download | meson-48e6db89ab702c0f7c0fb8b9cbcac857dce9c6ef.zip meson-48e6db89ab702c0f7c0fb8b9cbcac857dce9c6ef.tar.gz meson-48e6db89ab702c0f7c0fb8b9cbcac857dce9c6ef.tar.bz2 | |
Ask Ninja to expand rsp files in compile_commands.json
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 99428c7..a1b46a8 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -141,6 +141,10 @@ def find_coverage_tools(): return gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe def detect_ninja(version: str = '1.5', log: bool = False) -> str: + r = detect_ninja_command_and_version(version, log) + return r[0] if r else None + +def detect_ninja_command_and_version(version: str = '1.5', log: bool = False) -> (str, str): env_ninja = os.environ.get('NINJA', None) for n in [env_ninja] if env_ninja else ['ninja', 'ninja-build', 'samu']: try: @@ -162,7 +166,7 @@ def detect_ninja(version: str = '1.5', log: bool = False) -> str: if name == 'samu': name = 'samurai' mlog.log('Found {}-{} at {}'.format(name, found, quote_arg(n))) - return n + return (n, found) def get_llvm_tool_names(tool: str) -> typing.List[str]: # Ordered list of possible suffixes of LLVM executables to try. Start with |