Commit d604f357 authored by Brenden Blanco's avatar Brenden Blanco

Merge pull request #489 from aaronpuchert/permissive_regex

Don't require "OS ABI" specification in libraries
parents 3e7c3d9a 3926f264
......@@ -429,7 +429,7 @@ class BPF(object):
"ia64-64": "libc6,IA-64",
}
abi_type = mach_map.get(machine, "libc6")
expr = r"\s+lib%s\.[^\s]+\s+\(%s, [^)]+[^/]+([^\s]+)" % (name, abi_type)
expr = r"\s+lib%s\.[^\s]+\s+\(%s[^)]*[^/]+([^\s]+)" % (name, abi_type)
with os.popen("/sbin/ldconfig -p 2>/dev/null") as f:
data = f.read()
res = re.search(expr, data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment