diff options
| author | Pearu Peterson <pearu.peterson@gmail.com> | 2007-09-23 13:56:50 +0000 |
|---|---|---|
| committer | Pearu Peterson <pearu.peterson@gmail.com> | 2007-09-23 13:56:50 +0000 |
| commit | 7afbac20de2dab458578b7575d10509664a7b237 (patch) | |
| tree | 0b0305a18802060c00667336b4d6eaed740c0399 | |
| parent | aba52aeead780e3dfa8e83009a53c195ebd5b2f5 (diff) | |
| download | numpy-7afbac20de2dab458578b7575d10509664a7b237.tar.gz | |
fixing link error: fixed. Removing debug messages and added a warning message on the situation that triggered this issue: numpy.distutils must always be imported before distutils.
| -rw-r--r-- | numpy/distutils/__init__.py | 17 | ||||
| -rw-r--r-- | numpy/distutils/ccompiler.py | 1 | ||||
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py index 3af26ac41..b4490925e 100644 --- a/numpy/distutils/__init__.py +++ b/numpy/distutils/__init__.py @@ -1,5 +1,22 @@ from __version__ import version as __version__ + +# Check that distutils has not been imported before. +import sys +if 'distutils' in sys.modules: + sys.stderr.write('''\ +******************************************************** +WARNING!WARNING!WARNING!WARNING!WARNING!WARNING!WARNING! + +distutils has been imported before numpy.distutils +and now numpy.distutils cannot apply all of its +customizations to distutils effectively. + +To avoid this warning, make sure that numpy.distutils +is imported *before* distutils. +******************************************************** +''') + # Must import local ccompiler ASAP in order to get # customized CCompiler.spawn effective. import ccompiler diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index d75922768..882a53570 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -381,7 +381,6 @@ def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries): lib_opts.extend(list(i)) else: lib_opts.append(i) - log.info('DEBUG:'+`lib_opts, library_dirs, runtime_library_dirs`) return lib_opts ccompiler.gen_lib_options = gen_lib_options diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 5825a94f3..9277f9393 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -390,8 +390,6 @@ class build_ext (old_build_ext): else: kws = {} - log.debug('DEBUG: linker=%s,library_dirs=%s,ext.runtime_library_dirs=%s' % (linker, library_dirs, ext.runtime_library_dirs)) - linker(objects, ext_filename, libraries=libraries, library_dirs=library_dirs, |