diff options
| -rw-r--r-- | mesonbuild/environment.py | 1 | ||||
| -rw-r--r-- | mesonbuild/scripts/depfixer.py | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index a47208d..6c30fc1 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -763,7 +763,6 @@ class Environment: target = 'x86' if 'IA-32' in err else 'x86_64' cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler return cls(compiler, version, for_machine, is_cross, exe_wrap, target) - return cls(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, full_version=full_version) if 'Microsoft' in out or 'Microsoft' in err: # Latest versions of Visual Studio print version # number to stderr but earlier ones print version diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py index cc4669c..9925f4e 100644 --- a/mesonbuild/scripts/depfixer.py +++ b/mesonbuild/scripts/depfixer.py @@ -413,9 +413,8 @@ def fix_darwin(fname, new_rpath, final_path, install_name_mappings): subprocess.check_call(['install_name_tool', fname] + args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) - except Exception: - raise - sys.exit(0) + except Exception as err: + raise SystemExit(err) def fix_jar(fname): subprocess.check_call(['jar', 'xfv', fname, 'META-INF/MANIFEST.MF']) |