| 1 | --- scipy_core/scipy_distutils/gnufcompiler.py.orig 2005-07-30 18:17:12.000000000 -0700 |
|---|
| 2 | +++ scipy_core/scipy_distutils/gnufcompiler.py 2005-07-30 18:19:58.000000000 -0700 |
|---|
| 3 | @@ -20,7 +20,7 @@ |
|---|
| 4 | # GNU Fortran 0.5.25 20010319 (prerelease) |
|---|
| 5 | # Redhat: GNU Fortran (GCC 3.2.2 20030222 (Red Hat Linux 3.2.2-5)) 3.2.2 20030222 (Red Hat Linux 3.2.2-5) |
|---|
| 6 | |
|---|
| 7 | - for fc_exe in map(find_executable,['g77','f77']): |
|---|
| 8 | + for fc_exe in map(find_executable,['gfortran-dp-4.0','f77']): |
|---|
| 9 | if os.path.isfile(fc_exe): |
|---|
| 10 | break |
|---|
| 11 | executables = { |
|---|
| 12 | @@ -28,7 +28,7 @@ |
|---|
| 13 | 'compiler_f77' : [fc_exe,"-Wall","-fno-second-underscore"], |
|---|
| 14 | 'compiler_f90' : None, |
|---|
| 15 | 'compiler_fix' : None, |
|---|
| 16 | - 'linker_so' : [fc_exe], |
|---|
| 17 | + 'linker_so' : [fc_exe + " -Wall -bundle"], |
|---|
| 18 | 'archiver' : ["ar", "-cr"], |
|---|
| 19 | 'ranlib' : ["ranlib"], |
|---|
| 20 | } |
|---|
| 21 | @@ -53,7 +53,7 @@ |
|---|
| 22 | # This is when Python is from Apple framework |
|---|
| 23 | opt.extend(["-Wl,-framework","-Wl,Python"]) |
|---|
| 24 | #else we are running in Fink python. |
|---|
| 25 | - opt.extend(["-lcc_dynamic","-bundle"]) |
|---|
| 26 | + opt.extend(["-bundle"]) |
|---|
| 27 | else: |
|---|
| 28 | opt.append("-shared") |
|---|
| 29 | if sys.platform[:5]=='sunos': |
|---|
| 30 | @@ -90,7 +90,7 @@ |
|---|
| 31 | if os.path.isfile(os.path.join(d,f)): |
|---|
| 32 | break |
|---|
| 33 | else: |
|---|
| 34 | - g2c = 'g2c' |
|---|
| 35 | + g2c = 'gfortran' |
|---|
| 36 | if sys.platform=='win32': |
|---|
| 37 | opt.extend(['gcc',g2c]) |
|---|
| 38 | else: |
|---|
