diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-02-26 10:41:32 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-02-26 10:41:32 +0000 |
| commit | d1573af98a34d1cb8da4aa63b9d2cab19e3c567d (patch) | |
| tree | f2719f4cd8e3c6efdd0749ddeb94f7683fb91de5 /numpy/distutils/command/build_clib.py | |
| parent | c316a60c3638aedb53d5571816d77dc2fa0a82d1 (diff) | |
| parent | 0878b817981ebd66088184fa15589784aca96725 (diff) | |
| download | numpy-d1573af98a34d1cb8da4aa63b9d2cab19e3c567d.tar.gz | |
Merge coremath.
Diffstat (limited to 'numpy/distutils/command/build_clib.py')
| -rw-r--r-- | numpy/distutils/command/build_clib.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index 645c6427a..92498132d 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -10,7 +10,8 @@ from distutils.errors import DistutilsSetupError, DistutilsError, \ from numpy.distutils import log from distutils.dep_util import newer_group from numpy.distutils.misc_util import filter_sources, has_f_sources,\ - has_cxx_sources, all_strings, get_lib_source_files, is_sequence + has_cxx_sources, all_strings, get_lib_source_files, is_sequence, \ + get_numpy_include_dirs # Fix Python distutils bug sf #1718574: _l = old_build_clib.user_options @@ -162,8 +163,11 @@ class build_clib(old_build_clib): macros = build_info.get('macros') include_dirs = build_info.get('include_dirs') + if include_dirs is None: + include_dirs = [] extra_postargs = build_info.get('extra_compiler_args') or [] + include_dirs.extend(get_numpy_include_dirs()) # where compiled F90 module files are: module_dirs = build_info.get('module_dirs') or [] module_build_dir = os.path.dirname(lib_file) |