summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--numpy/core/setup.py3
-rw-r--r--numpy/distutils/misc_util.py5
2 files changed, 6 insertions, 2 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index dca1787a9..6671fc285 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -579,8 +579,7 @@ def configuration(parent_package='',top_path=None):
# explicitly add an extension which has generate_config_h and
# generate_numpyconfig_h as sources *before* adding npymath.
config.add_library('npymath',
- sources=[join('src', 'npy_math.c.src')],
- depends=[])
+ sources=[join('src', 'npy_math.c.src')])
multiarray_deps = [
join('src', 'multiarray', 'arrayobject.h'),
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index d6215824d..ecd60375e 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -1176,6 +1176,11 @@ class Configuration(object):
name = name #+ '__OF__' + self.name
build_info['sources'] = sources
+ # Sometimes, depends is not set up to an empty list by default, and if
+ # depends is not given to add_library, distutils barfs (#1134)
+ if not build_info.has_key('depends'):
+ build_info['depends'] = []
+
self._fix_paths_dict(build_info)
self.libraries.append((name,build_info))