diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-04 00:06:18 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-04 00:06:18 -0400 |
commit | e8dbb411b4c6e282b6848066dcbac3ced6d3a880 (patch) | |
tree | a907463f6bd7365682a3e7306b864c14f93c780e /setuptools/command/build_ext.py | |
parent | 3b7000ad8a3eba032d4d2654e31ae64c976cb494 (diff) | |
parent | ff75a6cbdbcde8d9e3b979c30c3d6e64a1bc5374 (diff) | |
download | external_python_setuptools-e8dbb411b4c6e282b6848066dcbac3ced6d3a880.tar.gz external_python_setuptools-e8dbb411b4c6e282b6848066dcbac3ced6d3a880.tar.bz2 external_python_setuptools-e8dbb411b4c6e282b6848066dcbac3ced6d3a880.zip |
Merge setuptools/command/*
--HG--
branch : Setuptools-Distribute merge
Diffstat (limited to 'setuptools/command/build_ext.py')
-rw-r--r-- | setuptools/command/build_ext.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py index 4a94572c..f2a53258 100644 --- a/setuptools/command/build_ext.py +++ b/setuptools/command/build_ext.py @@ -82,17 +82,15 @@ class build_ext(_build_ext): def get_ext_filename(self, fullname): filename = _build_ext.get_ext_filename(self,fullname) - if fullname not in self.ext_map: - return filename - ext = self.ext_map[fullname] - if isinstance(ext,Library): - fn, ext = os.path.splitext(filename) - return self.shlib_compiler.library_filename(fn,libtype) - elif use_stubs and ext._links_to_dynamic: - d,fn = os.path.split(filename) - return os.path.join(d,'dl-'+fn) - else: - return filename + if fullname in self.ext_map: + ext = self.ext_map[fullname] + if isinstance(ext,Library): + fn, ext = os.path.splitext(filename) + return self.shlib_compiler.library_filename(fn,libtype) + elif use_stubs and ext._links_to_dynamic: + d,fn = os.path.split(filename) + return os.path.join(d,'dl-'+fn) + return filename def initialize_options(self): _build_ext.initialize_options(self) |