diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-02-21 17:25:09 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-02-21 17:25:09 +0000 |
| commit | b4d0366abcec1ea1c2a1946167d1b9873f372a51 (patch) | |
| tree | 09e567210dda33fcf95434de560ac688b8804917 /numpy/distutils/command | |
| parent | 16287f8545397ea651658b878040eab249e84b6d (diff) | |
| parent | da364a18e447c334dfa2ca5083b08e1b6a7c0d10 (diff) | |
| download | numpy-b4d0366abcec1ea1c2a1946167d1b9873f372a51.tar.gz | |
Merged revisions 6153-6173,6176-6178,6184 via svnmerge from
http://svn.scipy.org/svn/numpy/branches/numpy-mingw-w64
........
r6153 | cdavid | 2008-12-19 17:06:06 +0900 (Fri, 19 Dec 2008) | 1 line
Add a function to find python dll on windows.
........
r6154 | cdavid | 2008-12-19 17:28:49 +0900 (Fri, 19 Dec 2008) | 1 line
Fix typo when getting system32 location.
........
r6155 | cdavid | 2008-12-19 17:37:19 +0900 (Fri, 19 Dec 2008) | 1 line
Add a function to get a dump of private headers from dll.
........
r6156 | cdavid | 2008-12-19 17:41:39 +0900 (Fri, 19 Dec 2008) | 1 line
Add a function to generate a .def file from a dll.
........
r6157 | cdavid | 2008-12-19 17:43:56 +0900 (Fri, 19 Dec 2008) | 1 line
Forgot to add the regex for the generate_def function.
........
r6158 | cdavid | 2008-12-19 17:53:49 +0900 (Fri, 19 Dec 2008) | 1 line
Fix .def file generation.
........
r6159 | cdavid | 2008-12-19 17:56:54 +0900 (Fri, 19 Dec 2008) | 1 line
Add a warning if no symbols found in the dll (if stripped, for example).
........
r6160 | cdavid | 2008-12-19 18:02:24 +0900 (Fri, 19 Dec 2008) | 1 line
Refactor build_import_library to take into account multi arch.
........
r6161 | cdavid | 2008-12-19 18:10:03 +0900 (Fri, 19 Dec 2008) | 1 line
Do not generate manifest when built with msver 8.*, it does not look like it is needed, and we dont support it anyway ATM.
........
r6162 | cdavid | 2008-12-19 18:18:08 +0900 (Fri, 19 Dec 2008) | 1 line
Show arch in the log when building import library.
........
r6163 | cdavid | 2008-12-19 18:22:18 +0900 (Fri, 19 Dec 2008) | 1 line
Fix missing out filename.
........
r6164 | cdavid | 2008-12-19 18:32:46 +0900 (Fri, 19 Dec 2008) | 1 line
Actually build the import library for mingw on amd64.
........
r6165 | cdavid | 2008-12-19 18:46:30 +0900 (Fri, 19 Dec 2008) | 1 line
Do not generate ordinal, and use the basename of the dll instead of the full path in the def.file.
........
r6166 | cdavid | 2008-12-19 18:48:01 +0900 (Fri, 19 Dec 2008) | 1 line
Trailing spaces.
........
r6167 | cdavid | 2008-12-19 18:55:16 +0900 (Fri, 19 Dec 2008) | 1 line
Add MS_WIN64 macro when built on amd64 + mingw.
........
r6168 | cdavid | 2008-12-19 18:57:06 +0900 (Fri, 19 Dec 2008) | 1 line
Forgot to import get_build_architecture.
........
r6169 | cdavid | 2008-12-19 18:57:52 +0900 (Fri, 19 Dec 2008) | 1 line
Use a tuple when defining the MS_WIN64 macro.
........
r6170 | cdavid | 2008-12-19 19:05:03 +0900 (Fri, 19 Dec 2008) | 1 line
Fix macro def.
........
r6171 | cdavid | 2008-12-19 19:21:54 +0900 (Fri, 19 Dec 2008) | 2 lines
Do not use g++ for linking on amd64.
........
r6172 | cdavid | 2008-12-19 19:25:18 +0900 (Fri, 19 Dec 2008) | 1 line
do not regenerate the import library if already there.
........
r6173 | cdavid | 2008-12-19 19:28:39 +0900 (Fri, 19 Dec 2008) | 1 line
Add one full msvcrt version for 80 (for manifest generation).
........
r6176 | cdavid | 2008-12-21 02:31:48 +0900 (Sun, 21 Dec 2008) | 1 line
Remove optimization flags for now, to speed up builds.
........
r6177 | cdavid | 2008-12-21 02:32:11 +0900 (Sun, 21 Dec 2008) | 1 line
Add MS_WIN64 for every compile command.
........
r6178 | cdavid | 2008-12-21 02:32:33 +0900 (Sun, 21 Dec 2008) | 1 line
Remove handling of MS_WIN64 in commands: deal with it in mingw tool only.
........
r6184 | cdavid | 2008-12-21 16:46:28 +0900 (Sun, 21 Dec 2008) | 1 line
Hardcode size of long double, because it is broken with mingw.
........
Diffstat (limited to 'numpy/distutils/command')
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 3092167c6..904cb9067 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -16,7 +16,7 @@ from numpy.distutils.exec_command import exec_command from numpy.distutils.system_info import combine_paths from numpy.distutils.misc_util import filter_sources, has_f_sources, \ has_cxx_sources, get_ext_source_files, \ - get_numpy_include_dirs, is_sequence + get_numpy_include_dirs, is_sequence, get_build_architecture from numpy.distutils.command.config_compiler import show_fortran_compilers try: |
