diff options
| author | carlkl <cmkleffner@gmail.com> | 2015-09-24 23:46:23 +0200 |
|---|---|---|
| committer | carlkl <cmkleffner@gmail.com> | 2015-09-24 23:46:23 +0200 |
| commit | b354c005ccfe961e793ec4567e9cf6bbdca1b5f2 (patch) | |
| tree | 50a456686e70f13601b30e1f9769bd88836b9d3a /numpy/distutils/mingw32ccompiler.py | |
| parent | 941a4e037d394dada43e3c2beef1e650d5505742 (diff) | |
| download | numpy-b354c005ccfe961e793ec4567e9cf6bbdca1b5f2.tar.gz | |
BLD: mingwpy fixes
Diffstat (limited to 'numpy/distutils/mingw32ccompiler.py')
| -rw-r--r-- | numpy/distutils/mingw32ccompiler.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py index f72c3bbbb..f1220b36a 100644 --- a/numpy/distutils/mingw32ccompiler.py +++ b/numpy/distutils/mingw32ccompiler.py @@ -95,9 +95,10 @@ class Mingw32CCompiler(distutils.cygwinccompiler.CygwinCCompiler): # Before build with MinGW-W64 generate the python import library # with gendef and dlltool according to the MingW-W64 FAQ. # Use the MinGW-W64 provided msvc runtime import libraries. + # The mingwpy package deploys it's own import libraries. # Don't call build_import_library() and build_msvcr_library. - if 'MinGW-W64' not in str(out_string): + if 'MinGW-W64' not in str(out_string) and 'mingwpy' not in str(out_string): # **changes: eric jones 4/11/01 # 1. Check for import library on Windows. Build if it doesn't @@ -131,10 +132,10 @@ class Mingw32CCompiler(distutils.cygwinccompiler.CygwinCCompiler): else: # gcc-4 series releases do not support -mno-cygwin option self.set_executables( - compiler='gcc -march=x86-64 -mtune=generic -DMS_WIN64' - ' -O2 -msse2 -Wall', - compiler_so='gcc -march=x86-64 -mtune=generic -DMS_WIN64' - ' -O2 -msse2 -Wall -Wstrict-prototypes', + compiler='gcc -O2 -march=x86-64 -mtune=generic -DMS_WIN64' + ' -msse2 -mlong-double-64 -Wall', + compiler_so='gcc -O2 -march=x86-64 -mtune=generic -DMS_WIN64' + ' -msse2 -mlong-double-64 -Wall -Wstrict-prototypes', linker_exe='gcc', linker_so='gcc -shared -Wl,-gc-sections -Wl,-s') else: @@ -158,11 +159,11 @@ class Mingw32CCompiler(distutils.cygwinccompiler.CygwinCCompiler): # build needs '-mincoming-stack-boundary=2' due to ABI # incompatibility to Win32 ABI self.set_executables( - compiler='gcc -O2 -march=core2 -mtune=generic' - ' -mfpmath=sse -msse2' + compiler='gcc -O2 -march=pentium4 -mtune=generic' + ' -mfpmath=sse -msse2 -mlong-double-64' ' -mincoming-stack-boundary=2 -Wall', - compiler_so='gcc -O2 -march=core2 -mtune=generic' - ' -mfpmath=sse -msse2' + compiler_so='gcc -O2 -march=pentium4 -mtune=generic' + ' -mfpmath=sse -msse2 -mlong-double-64' ' -mincoming-stack-boundary=2 -Wall' ' -Wstrict-prototypes', linker_exe='g++ ', |