summaryrefslogtreecommitdiff
path: root/numpy/distutils/command/config.py
diff options
context:
space:
mode:
authorPearu Peterson <pearu.peterson@gmail.com>2007-05-19 17:01:39 +0000
committerPearu Peterson <pearu.peterson@gmail.com>2007-05-19 17:01:39 +0000
commit0168bce06a2d0266a2d337a2f587ec1327d19fb4 (patch)
treef525c835c8d0b30bceeed73b4d7774263b0707c1 /numpy/distutils/command/config.py
parent2f70b977daff3fba00cbe1c02ec063ff10b45b96 (diff)
downloadnumpy-0168bce06a2d0266a2d337a2f587ec1327d19fb4.tar.gz
win32: fix install when build has been carried out earlier.
Diffstat (limited to 'numpy/distutils/command/config.py')
-rw-r--r--numpy/distutils/command/config.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
index 75a574fca..0d13d8e53 100644
--- a/numpy/distutils/command/config.py
+++ b/numpy/distutils/command/config.py
@@ -56,8 +56,8 @@ class config(old_config):
headers, include_dirs,
libraries, library_dirs, lang):
if self.compiler.compiler_type=='msvc':
- libraries = libraries[:]
- library_dirs = library_dirs[:]
+ libraries = (libraries or [])[:]
+ library_dirs = (library_dirs or [])[:]
if lang in ['f77','f90']:
lang = 'c' # always use system linker when using MSVC compiler
if self.fcompiler:
@@ -71,7 +71,7 @@ class config(old_config):
for libname in self.fcompiler.libraries or []:
if libname not in libraries:
libraries.append(libname)
- for libname in libraries or []:
+ for libname in libraries:
if libname.startswith('msvcr'): continue
fileexists = False
for libdir in library_dirs or []:
@@ -82,7 +82,7 @@ class config(old_config):
if fileexists:
continue
# make g77-compiled static libs available to MSVC
- for libdir in library_dirs or []:
+ for libdir in library_dirs:
libfile = os.path.join(libdir,'lib%s.a' % (libname))
if os.path.isfile(libfile):
# copy libname.a file to name.lib so that MSVC linker