diff options
Diffstat (limited to 'methods.py')
| -rw-r--r-- | methods.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/methods.py b/methods.py index 4d1f4c1cda..f0e51c7d6f 100644 --- a/methods.py +++ b/methods.py @@ -926,7 +926,11 @@ def get_compiler_version(env): # Not using -dumpversion as some GCC distros only return major, and # Clang used to return hardcoded 4.2.1: # https://reviews.llvm.org/D56803 try: - version = subprocess.check_output([env.subst(env["CXX"]), "--version"]).strip().decode("utf-8") + version = ( + subprocess.check_output([env.subst(env["CXX"]), "--version"], shell=(os.name == "nt")) + .strip() + .decode("utf-8") + ) except (subprocess.CalledProcessError, OSError): print("Couldn't parse CXX environment variable to infer compiler version.") return ret @@ -990,6 +994,10 @@ def using_emcc(env): def show_progress(env): + if env["ninja"]: + # Has its own progress/tracking tool that clashes with ours + return + import sys from SCons.Script import Progress, Command, AlwaysBuild |