diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-03-12 16:34:36 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-03-12 16:34:36 +0000 |
| commit | ebd770a34e4d2e9326eca18e5a45c14ab75c56f0 (patch) | |
| tree | 18fbaa8db9272a61e0641f0cea67041d072609e0 /numpy | |
| parent | 016763c26f6f55d6a37ed508ab773b53e709a49f (diff) | |
| download | numpy-ebd770a34e4d2e9326eca18e5a45c14ab75c56f0.tar.gz | |
Back out VS 2003 hack - it is too fragile.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 5 | ||||
| -rw-r--r-- | numpy/distutils/command/build_src.py | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 6787c0b30..c47357808 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -388,10 +388,7 @@ class build_ext (old_build_ext): # expand libraries with fcompiler libraries as we are # not using fcompiler linker self._libs_with_msvc_and_fortran(fcompiler, libraries, library_dirs) - if fcompiler is not None and fcompiler.compiler_type == "gnu95": - if msvc_version(self.compiler) < 8: - self._add_dummy_mingwex_sym(c_sources) - libraries.append("_gfortran_workaround") + elif ext.language in ['f77','f90'] and fcompiler is not None: linker = fcompiler.link_shared_object if ext.language=='c++' and cxx_compiler is not None: diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index 6d18f64e6..4ba3f0a9a 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -275,13 +275,6 @@ class build_src(build_ext.build_ext): #for f in h_files: # self.distribution.headers.append((package,f)) - hack_name = os.path.join(os.path.dirname(__file__), - os.pardir, "mingw", "gfortran_vs2003_hack.c") - target_c = os.path.join(self.build_src, - "gfortran_vs2003_hack.c") - import shutil - shutil.copy(hack_name, target_c) - #sources.append(target_c) ext.sources = sources def generate_sources(self, sources, extension): |