[Numpy-svn] r6178 - in branches/numpy-mingw-w64/numpy/distutils: . command

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-12-20 11:32:33 -0600 (Sat, 20 Dec 2008)
New Revision: 6178

Modified:
   branches/numpy-mingw-w64/numpy/distutils/command/build_ext.py
   branches/numpy-mingw-w64/numpy/distutils/mingw32ccompiler.py
Log:
Remove handling of MS_WIN64 in commands: deal with it in mingw tool only.

Modified: branches/numpy-mingw-w64/numpy/distutils/command/build_ext.py
===================================================================
--- branches/numpy-mingw-w64/numpy/distutils/command/build_ext.py	2008-12-20 17:32:11 UTC (rev 6177)
+++ branches/numpy-mingw-w64/numpy/distutils/command/build_ext.py	2008-12-20 17:32:33 UTC (rev 6178)
@@ -278,14 +278,6 @@
             c_sources += cxx_sources
             cxx_sources = []
 
-        # MS_WIN64 should be defined when building for amd64 on windows, but
-        # python headers define it only for MS compilers, which has all kind of
-        # bad consequences, like using Py_ModuleInit4 instead of
-        # Py_ModuleInit4_64, etc... So we add it here
-        if self.compiler.compiler_type == 'mingw32' and \
-           get_build_architecture() == 'AMD64':
-               macros.append(('MS_WIN64', None))
-
         # Set Fortran/C++ compilers for compilation and linking.
         if ext.language=='f90':
             fcompiler = self._f90_compiler

Modified: branches/numpy-mingw-w64/numpy/distutils/mingw32ccompiler.py
===================================================================
--- branches/numpy-mingw-w64/numpy/distutils/mingw32ccompiler.py	2008-12-20 17:32:11 UTC (rev 6177)
+++ branches/numpy-mingw-w64/numpy/distutils/mingw32ccompiler.py	2008-12-20 17:32:33 UTC (rev 6178)
@@ -93,6 +93,11 @@
         #                     linker_exe='gcc -mno-cygwin',
         #                     linker_so='%s --driver-name g++ -mno-cygwin -mdll -static %s'
         #                                % (self.linker, entry_point))
+
+        # MS_WIN64 should be defined when building for amd64 on windows, but
+        # python headers define it only for MS compilers, which has all kind of
+        # bad consequences, like using Py_ModuleInit4 instead of
+        # Py_ModuleInit4_64, etc... So we add it here
         if get_build_architecture() == 'AMD64':
             self.set_executables(
                     compiler='gcc -DMS_WIN64 -mno-cygwin -O0 -Wall',