Commit 931f0c3c authored by Michael Davidsaver's avatar Michael Davidsaver

osx cleanup

parent 6b1b72f0
...@@ -119,7 +119,6 @@ class dso2libmixin: ...@@ -119,7 +119,6 @@ class dso2libmixin:
except ImportError: except ImportError:
pass pass
found = False
for candidate in dsosearch: for candidate in dsosearch:
C = os.path.join(candidate, libname) C = os.path.join(candidate, libname)
if not os.path.isfile(C): if not os.path.isfile(C):
...@@ -127,21 +126,8 @@ class dso2libmixin: ...@@ -127,21 +126,8 @@ class dso2libmixin:
else: else:
log.debug(" Found %s"%C) log.debug(" Found %s"%C)
ext.library_dirs.append(candidate) ext.library_dirs.append(candidate)
if sys.platform == 'darwin':
# now find the full name of the library (including major version)
full = glob.glob(os.path.join(candidate, 'lib%s.*.dylib'%parts[-1]))
if len(full)==0:
fullname = libname
elif len(full)==1:
fullname = os.path.basename(full[0])
else:
raise RuntimeError("Something wierd happened. Please report. %s"%full)
found = True
break break
else:
if not found:
raise RuntimeError("Unable to find DSO %s needed by extension %s"%(dso, ext.name)) raise RuntimeError("Unable to find DSO %s needed by extension %s"%(dso, ext.name))
ext.libraries.append(parts[-1]) ext.libraries.append(parts[-1])
......
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