Skip to content

Commit 7aecfb1

Browse files
scivisionjpakkane
authored andcommitted
remove unreachable code
1 parent 923efe9 commit 7aecfb1

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

mesonbuild/environment.py

-1
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,6 @@ def sanitize(p):
763763
target = 'x86' if 'IA-32' in err else 'x86_64'
764764
cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler
765765
return cls(compiler, version, for_machine, is_cross, exe_wrap, target)
766-
return cls(ccache + compiler, version, compiler_type, for_machine, is_cross, exe_wrap, full_version=full_version)
767766
if 'Microsoft' in out or 'Microsoft' in err:
768767
# Latest versions of Visual Studio print version
769768
# number to stderr but earlier ones print version

mesonbuild/scripts/depfixer.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,8 @@ def fix_darwin(fname, new_rpath, final_path, install_name_mappings):
413413
subprocess.check_call(['install_name_tool', fname] + args,
414414
stdout=subprocess.DEVNULL,
415415
stderr=subprocess.DEVNULL)
416-
except Exception:
417-
raise
418-
sys.exit(0)
416+
except Exception as err:
417+
raise SystemExit(err)
419418

420419
def fix_jar(fname):
421420
subprocess.check_call(['jar', 'xfv', fname, 'META-INF/MANIFEST.MF'])

0 commit comments

Comments
 (0)