mirror of
https://github.com/Z3Prover/z3
synced 2025-04-15 21:38:44 +00:00
Merge pull request #750 from angr/fix/python-global-load
allow python to load libz3 using loader's default search
This commit is contained in:
commit
f00d5b89e0
|
@ -1611,7 +1611,7 @@ _lib = None
|
||||||
def lib():
|
def lib():
|
||||||
global _lib
|
global _lib
|
||||||
if _lib is None:
|
if _lib is None:
|
||||||
_dirs = ['.', pkg_resources.resource_filename('z3', 'lib'), os.path.join(sys.prefix, 'lib'), '']
|
_dirs = ['.', pkg_resources.resource_filename('z3', 'lib'), os.path.join(sys.prefix, 'lib'), None]
|
||||||
for _dir in _dirs:
|
for _dir in _dirs:
|
||||||
try:
|
try:
|
||||||
init(_dir)
|
init(_dir)
|
||||||
|
@ -1641,9 +1641,12 @@ else:
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
def init(PATH):
|
def init(PATH):
|
||||||
|
if PATH:
|
||||||
PATH = os.path.realpath(PATH)
|
PATH = os.path.realpath(PATH)
|
||||||
if os.path.isdir(PATH):
|
if os.path.isdir(PATH):
|
||||||
PATH = os.path.join(PATH, 'libz3.%s' % _ext)
|
PATH = os.path.join(PATH, 'libz3.%s' % _ext)
|
||||||
|
else:
|
||||||
|
PATH = 'libz3.%s' % _ext
|
||||||
|
|
||||||
global _lib
|
global _lib
|
||||||
_lib = ctypes.CDLL(PATH)
|
_lib = ctypes.CDLL(PATH)
|
||||||
|
|
Loading…
Reference in a new issue