Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove unreachable code

This commit is contained in:
Michael Hirsch, Ph.D 2019-07-31 12:09:56 -04:00 committed by Jussi Pakkanen
parent 923efe9eda
commit 7aecfb1540
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mesonbuild/environment.py
View File

@ -763,7 +763,6 @@ class Environment:
target = 'x86' if 'IA-32' in err else 'x86_64' target = 'x86' if 'IA-32' in err else 'x86_64'
cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler
return cls(compiler, version, for_machine, is_cross, exe_wrap, target) 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: if 'Microsoft' in out or 'Microsoft' in err:
# Latest versions of Visual Studio print version # Latest versions of Visual Studio print version
# number to stderr but earlier ones print version # number to stderr but earlier ones print version

5
mesonbuild/scripts/depfixer.py
View File

@ -413,9 +413,8 @@ def fix_darwin(fname, new_rpath, final_path, install_name_mappings):
subprocess.check_call(['install_name_tool', fname] + args, subprocess.check_call(['install_name_tool', fname] + args,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL)
except Exception: except Exception as err:
raise raise SystemExit(err)
sys.exit(0)
def fix_jar(fname): def fix_jar(fname):
subprocess.check_call(['jar', 'xfv', fname, 'META-INF/MANIFEST.MF']) subprocess.check_call(['jar', 'xfv', fname, 'META-INF/MANIFEST.MF'])