diff options
| author | Greg Ward <gward@python.net> | 2000-06-25 02:30:15 (GMT) |
|---|---|---|
| committer | Greg Ward <gward@python.net> | 2000-06-25 02:30:15 (GMT) |
| commit | e401e15d18e1a9458c2b05a59792760caeec758a (patch) | |
| tree | 00b20159f49961ed7eb678bf27359f50d092e768 | |
| parent | f46a688e847dfc6a560ada112c1b3eec1fb74c4d (diff) | |
| download | cpython-e401e15d18e1a9458c2b05a59792760caeec758a.zip cpython-e401e15d18e1a9458c2b05a59792760caeec758a.tar.gz cpython-e401e15d18e1a9458c2b05a59792760caeec758a.tar.bz2 | |
Removed some debugging code that slipped into the last checkin.
Ensure that 'extra_args' (whether compile or link args) is never None.
| -rw-r--r-- | Lib/distutils/command/build_ext.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 0a5fa9c..26d6981 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -188,8 +188,7 @@ 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, - compiler="msvc", + self.compiler = new_compiler (compiler=self.compiler, verbose=self.verbose, dry_run=self.dry_run, force=self.force) @@ -393,7 +392,7 @@ class build_ext (Command): # The environment variable should take precedence, and # any sensible compiler will give precendence to later # command line args. Hence we combine them in order: - extra_args = ext.extra_compile_args + extra_args = ext.extra_compile_args or [] # XXX and if we support CFLAGS, why not CC (compiler # executable), CPPFLAGS (pre-processor options), and LDFLAGS @@ -415,7 +414,7 @@ class build_ext (Command): # that go into the mix. if ext.extra_objects: objects.extend (ext.extra_objects) - extra_args = ext.extra_link_args + extra_args = ext.extra_link_args or [] # Bunch of fixing-up we have to do for Microsoft's linker. if self.compiler.compiler_type == 'msvc': |