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

Fix tool detection in OSX.

This commit is contained in:
Jussi Pakkanen 2013-03-03 13:13:31 +02:00
parent 3f3496f08a
commit 5d2f6b2a6e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environment.py
View File

@ -319,15 +319,21 @@ class Environment():
def detect_static_linker(self): def detect_static_linker(self):
exelist = self.get_static_linker_exelist() exelist = self.get_static_linker_exelist()
p = subprocess.Popen(exelist + ['--version'], stdout=subprocess.PIPE) p = subprocess.Popen(exelist + ['--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out = p.communicate()[0] (out, err) = p.communicate()
out = out.decode() out = out.decode()
err = err.decode()
if p.returncode == 0: if p.returncode == 0:
return ArLinker(exelist) return ArLinker(exelist)
if p.returncode == 1 and err.startswith('usage'): # OSX
return ArLinker(exelist)
raise EnvironmentException('Unknown static linker "' + ' '.join(exelist) + '"') raise EnvironmentException('Unknown static linker "' + ' '.join(exelist) + '"')
def detect_ccache(self): def detect_ccache(self):
has_ccache = subprocess.call(['ccache', '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) try:
has_ccache = subprocess.call(['ccache', '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
except FileNotFoundError:
has_ccache = 1
if has_ccache == 0: if has_ccache == 0:
cmdlist = ['ccache'] cmdlist = ['ccache']
else: else: