aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/build_ext.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-01-13 22:32:57 +0000
committerPJ Eby <distutils-sig@python.org>2006-01-13 22:32:57 +0000
commitf41432389955d4e1835cef866d23b15ab6edf51a (patch)
treee56c15af754252fdc6fadd348ea0dd43a8451ec1 /setuptools/command/build_ext.py
parenteb8c892b98be8410b2ec084ed6d7a33ea164bf4b (diff)
downloadexternal_python_setuptools-f41432389955d4e1835cef866d23b15ab6edf51a.tar.gz
external_python_setuptools-f41432389955d4e1835cef866d23b15ab6edf51a.tar.bz2
external_python_setuptools-f41432389955d4e1835cef866d23b15ab6edf51a.zip
Don't write .py stubs except for actual extensions that don't already
have them. --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4042034
Diffstat (limited to 'setuptools/command/build_ext.py')
-rw-r--r--setuptools/command/build_ext.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index 6d5fb124..7f110436 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -165,12 +165,12 @@ class build_ext(_build_ext):
def build_extension(self, ext):
_compiler = self.compiler
_rpath = ext.runtime_library_dirs
- _ldirs = library_dirs
+ _ldirs = ext.library_dirs
try:
if isinstance(ext,Library):
self.compiler = self.shlib_compiler
- if have_rtld and self.links_to_dynamic(ext):
- ext.runtime_library_dirs = _rpath + [os.curdir]
+ if self.links_to_dynamic(ext):
+ if have_rtld: ext.runtime_library_dirs = _rpath + [os.curdir]
ext.library_dirs = _ldirs + [
os.path.dirname(
os.path.join(self.build_lib,
@@ -196,12 +196,12 @@ class build_ext(_build_ext):
libnames = dict.fromkeys(
[self.get_ext_fullname(lib.name) for lib in self.shlibs]
)
- if not libnames:
- return False
pkg = '.'.join(self.get_ext_fullname(ext.name).split('.')[:-1])
+ if pkg: pkg+='.'
for libname in ext.libraries:
- if ('%s.%s' % (pkg,libname)) in libnames:
- return True
+ if pkg+libname in libnames: return True
+ return False
+
if have_rtld or os.name=='nt':
# Build shared libraries