diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-10-20 08:31:52 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-10-20 08:31:52 -0600 |
| commit | 5fd1707ea9576b5a4efff5866a8e8d36f36ef6e9 (patch) | |
| tree | 0559fd1a9deee5cb169f8f4e7d8b8958f6e844a6 /numpy/distutils/fcompiler | |
| parent | 8561c1542b42c4541f9f99ef4ad2fb8747d9943d (diff) | |
| download | numpy-5fd1707ea9576b5a4efff5866a8e8d36f36ef6e9.tar.gz | |
Revert "Merge pull request #6354 from mingwpy/mingwpy"
Revert mingwpy modifications to distutils. They are causing problems
for non-windows builds and it is better to wait until mingypy is
further along.
This reverts commit cda64938eb150b1af6677db4754da3be5fd7e483, reversing
changes made to 8cb3ec6ab804f594daf553e53e7cf7478656bebd.
Diffstat (limited to 'numpy/distutils/fcompiler')
| -rw-r--r-- | numpy/distutils/fcompiler/gnu.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index 9acbe537d..a7fd3a77f 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -24,6 +24,7 @@ def is_win32(): return sys.platform == "win32" and platform.architecture()[0] == "32bit" if is_win64(): + #_EXTRAFLAGS = ["-fno-leading-underscore"] _EXTRAFLAGS = [] else: _EXTRAFLAGS = [] @@ -214,12 +215,10 @@ class GnuFCompiler(FCompiler): # use -mincoming-stack-boundary=2 # due to the change to 16 byte stack alignment since GCC 4.6 # but 32 bit Windows ABI defines 4 bytes stack alignment - opt = ['-O2 -march=pentium4 -mtune=generic -mfpmath=sse -msse2' - ' -mlong-double-64 -mincoming-stack-boundary=2' - ' -ffpe-summary=invalid,zero'] + opt = ['-O2 -march=core2 -mtune=generic -mfpmath=sse -msse2 ' + '-mincoming-stack-boundary=2'] else: - opt = ['-O2 -march=x86-64 -DMS_WIN64 -mtune=generic -msse2' - ' -mlong-double-64 -ffpe-summary=invalid,zero'] + opt = ['-O2 -march=x86-64 -DMS_WIN64 -mtune=generic -msse2'] else: opt = ['-O2'] @@ -271,11 +270,11 @@ class Gnu95FCompiler(GnuFCompiler): 'version_cmd' : ["<F90>", "-dumpversion"], 'compiler_f77' : [None, "-Wall", "-g", "-ffixed-form", "-fno-second-underscore"] + _EXTRAFLAGS, - 'compiler_f90' : [None, "-Wall", + 'compiler_f90' : [None, "-Wall", "-g", "-fno-second-underscore"] + _EXTRAFLAGS, 'compiler_fix' : [None, "-Wall", "-g","-ffixed-form", "-fno-second-underscore"] + _EXTRAFLAGS, - 'linker_so' : ["<F90>", "-Wall"], + 'linker_so' : ["<F90>", "-Wall", "-g"], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"], 'linker_exe' : [None, "-Wall"] |