merge heads

This commit is contained in:
Benjamin Peterson 2011-12-15 15:44:16 -05:00
commit 57c9c7b755

View file

@ -186,7 +186,7 @@ def libc_ver(executable=sys.executable,lib='',version='',
elif so:
if lib != 'glibc':
lib = 'libc'
if soversion > version:
if soversion and soversion > version:
version = soversion
if threads and version[-len(threads):] != threads:
version = version + threads