summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-05-12 21:20:41 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-05-12 21:20:41 (GMT)
commit44c3c0e2b98850cfbf53c42c7d4bbb9f27a3b2e2 (patch)
tree9b94644ebf69d5adc9a327209ff6be97167b98b9 /Lib/distutils/command
parent8dc07c0eb4e37bbf0c7a623df1bd6baf789cc784 (diff)
downloadcpython-44c3c0e2b98850cfbf53c42c7d4bbb9f27a3b2e2.zip
cpython-44c3c0e2b98850cfbf53c42c7d4bbb9f27a3b2e2.tar.gz
cpython-44c3c0e2b98850cfbf53c42c7d4bbb9f27a3b2e2.tar.bz2
Merged revisions 72593 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72593 | benjamin.peterson | 2009-05-12 16:06:05 -0500 (Tue, 12 May 2009) | 1 line the compiler attribute is used in setup.py; can't rename ........
Diffstat (limited to 'Lib/distutils/command')
-rw-r--r--Lib/distutils/command/build_ext.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index c611ad4..01bab36 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -303,38 +303,38 @@ class build_ext (Command):
# Setup the CCompiler object that we'll use to do all the
# compiling and linking
- self._compiler = new_compiler(compiler=self.compiler,
+ self.compiler = new_compiler(compiler=None,
verbose=self.verbose,
dry_run=self.dry_run,
force=self.force)
- customize_compiler(self._compiler)
+ customize_compiler(self.compiler)
# If we are cross-compiling, init the compiler now (if we are not
# cross-compiling, init would not hurt, but people may rely on
# late initialization of compiler even if they shouldn't...)
if os.name == 'nt' and self.plat_name != get_platform():
- self._compiler.initialize(self.plat_name)
+ self.compiler.initialize(self.plat_name)
# And make sure that any compile/link-related options (which might
# come from the command-line or from the setup script) are set in
# that CCompiler object -- that way, they automatically apply to
# all compiling and linking done here.
if self.include_dirs is not None:
- self._compiler.set_include_dirs(self.include_dirs)
+ self.compiler.set_include_dirs(self.include_dirs)
if self.define is not None:
# 'define' option is a list of (name,value) tuples
for (name, value) in self.define:
- self._compiler.define_macro(name, value)
+ self.compiler.define_macro(name, value)
if self.undef is not None:
for macro in self.undef:
- self._compiler.undefine_macro(macro)
+ self.compiler.undefine_macro(macro)
if self.libraries is not None:
- self._compiler.set_libraries(self.libraries)
+ self.compiler.set_libraries(self.libraries)
if self.library_dirs is not None:
- self._compiler.set_library_dirs(self.library_dirs)
+ self.compiler.set_library_dirs(self.library_dirs)
if self.rpath is not None:
- self._compiler.set_runtime_library_dirs(self.rpath)
+ self.compiler.set_runtime_library_dirs(self.rpath)
if self.link_objects is not None:
- self._compiler.set_link_objects(self.link_objects)
+ self.compiler.set_link_objects(self.link_objects)
# Now actually compile and link everything.
self.build_extensions()
@@ -490,7 +490,7 @@ class build_ext (Command):
for undef in ext.undef_macros:
macros.append((undef,))
- objects = self._compiler.compile(sources,
+ objects = self.compiler.compile(sources,
output_dir=self.build_temp,
macros=macros,
include_dirs=ext.include_dirs,
@@ -517,9 +517,9 @@ class build_ext (Command):
extra_args = ext.extra_link_args or []
# Detect target language, if not provided
- language = ext.language or self._compiler.detect_language(sources)
+ language = ext.language or self.compiler.detect_language(sources)
- self._compiler.link_shared_object(
+ self.compiler.link_shared_object(
objects, ext_path,
libraries=self.get_libraries(ext),
library_dirs=ext.library_dirs,
@@ -690,7 +690,7 @@ class build_ext (Command):
# Append '_d' to the python import library on debug builds.
if sys.platform == "win32":
from distutils.msvccompiler import MSVCCompiler
- if not isinstance(self._compiler, MSVCCompiler):
+ if not isinstance(self.compiler, MSVCCompiler):
template = "python%d%d"
if self.debug:
template = template + '_d'