diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-12-12 02:49:21 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-12-12 02:49:21 +0000 |
| commit | aa45d39c7294e6195b14bb6f2a8187d23070b3ba (patch) | |
| tree | e11c26644591987578d61913c044b2810264deaa /lib | |
| parent | 2f24b4ca1470c53fca86e4d271c2137d333ae966 (diff) | |
Updates to digital fortran libraries.
Added stuff for Intel Fortran compiler.
Now define WIN32_DIGITAL_FORTRAN if using
Digital fortran, so strings can be done
differently for intel compiler (in fact that
compiler is the same as the unix ones for strings).
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1928 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/make/known-architectures/cygwin | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/lib/make/known-architectures/cygwin b/lib/make/known-architectures/cygwin index 5f32164c..9c4a627e 100644 --- a/lib/make/known-architectures/cygwin +++ b/lib/make/known-architectures/cygwin @@ -28,6 +28,10 @@ if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then else + CCTK_WriteLine cctk_Archdefs.h '/* WIN stuff */' + CCTK_WriteLine cctk_Archdefs.h '#define WIN32' + + # /Gd means use __cdecl, it's /Gz for __stdcall if test -z "$CFLAGS"; then @@ -45,10 +49,12 @@ else CYGWIN_F90_COMP= if test -n "$F90" ; then - if test "`$F90 | grep -i digital`" ; then + if test "`$F90 2>&1 | grep -i digital`" ; then CYGWIN_F90_COMP=digital - elif test "`$F90 | grep -i compaq`" ; then + elif test "`$F90 2>&1 | grep -i compaq`" ; then CYGWIN_F90_COMP=compaq + elif test "`$F90 2>&1 | grep -i intel`" ; then + CYGWIN_F90_COMP=intel else echo Unknown Windows f90 compiler. echo Please add appropriate information to @@ -63,14 +69,21 @@ else case "$CYGWIN_F90_COMP" in digital) - : ${F90_LIBS="dfconsol dfport"} + : ${F90_LIBS="dfor dfconsol dfport"} : ${FCOMPILEONLY="/compile_only /object:"} : ${F90FLAGS="/fast /iface:cref"} + CCTK_WriteLine cctk_Archdefs.h '#define WIN32_DIGITAL_FORTRAN' ;; compaq) - : ${F90_LIBS="dfconsol dfport"} + : ${F90_LIBS="dfor dfconsol dfport"} : ${FCOMPILEONLY="/compile_only /object:"} : ${F90FLAGS="/fast /iface:cref"} + CCTK_WriteLine cctk_Archdefs.h "#define WIN32_DIGITAL_FORTRAN" + ;; + intel) + : ${F90_LIBS=""} + : ${FCOMPILEONLY="/c /Fo"} + : ${F90FLAGS="/nologo"} ;; *) : @@ -105,13 +118,6 @@ else # doing inplace editing PERL_BACKUP_NECESSARY='yes' - cat >> cctk_Archdefs.h <<EOF; - -/* WIN stuff */ -#define WIN32 - -EOF - if test "x$cross_compiling" = "xyes" ; then case "$host_cpu" in i?86) |