summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2009-10-13 04:57:31 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2009-10-13 04:57:31 (GMT)
commit93bea90f586a30e334ae8191a1413d906c76ddde (patch)
tree989d131e62f72e8dd2c9b18cba7c56beadace548
parent451f5b1b11696c00d193f0a7c20b64d074065177 (diff)
downloadhdf5-93bea90f586a30e334ae8191a1413d906c76ddde.zip
hdf5-93bea90f586a30e334ae8191a1413d906c76ddde.tar.gz
hdf5-93bea90f586a30e334ae8191a1413d906c76ddde.tar.bz2
[svn-r17636] Maintenance: Changed default fortran compiler for Mac Intel to gfortran
Cleaned up the file to be inline with other config files that use multiple compilers. Platforms tested: My Mac pahra with gfortran, ifort and g95
-rw-r--r--config/apple69
1 files changed, 23 insertions, 46 deletions
diff --git a/config/apple b/config/apple
index 529e74b..8c4cc8e 100644
--- a/config/apple
+++ b/config/apple
@@ -28,53 +28,30 @@ fi
# Figure out compiler flags
. $srcdir/config/gnu-flags
-
-# The default Fortran 90 compiler
+
+. $srcdir/config/intel-flags
if test "X-" = "X-$FC"; then
- # Assume Absoft compiler
- FC=xlf
- FC_BASENAME=xlf
- else
-
- # Neither xlf nor f95 have a working "version" command.
- # If FC is set, try to guess which one is being used by examining
- # the last element in the path to the compiler.
-
- TEMP_BASENAME=`basename $FC`
- if test "xlf" = "${TEMP_BASENAME}"; then
- FC_BASENAME=xlf
- else
- FC_BASENAME=f95
- fi
+ case $CC_BASENAME in
+ gcc*)
+ FC=gfortran
+ FC_BASENAME=gfortran
+ ;;
+ icc*)
+ FC=ifort
+ FC_BASENAME=ifort
+ ;;
+ esac
fi
-
-case $FC_BASENAME in
- xlf)
- F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90"
- H5_FCFLAGS="$H5_FCFLAGS ${F9XSUFFIXFLAG} -qmoddir=./ "
- FSEARCH_DIRS="-I./ -I../src"
- DEBUG_FCFLAGS="-g"
- PROD_FCFLAGS="-O"
- PROFILE_FCFLAGS="-g"
- f9x_flags_set=yes
- ;;
-
- f95)
-
- F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names
-# (just in case since this should be a default EIP)
- H5_FCFLAGS="$H5_FCFLAGS"
- FSEARCH_DIRS=""
- DEBUG_FCFLAGS="-g"
- PROD_FCFLAGS="-O"
- PROFILE_FCFLAGS="-g -pg"
- f9x_flags_set=yes
-
-# f95 doesn't support shared libraries
- echo ' warning: shared libraries are not supported for f95!'
- echo ' disabling shared libraries'
+# Figure out compiler flags
+. $srcdir/config/gnu-fflags
+
+. $srcdir/config/intel-fflags
+
+# Fortran doesn't work with shared libraries
+#
+if test "X-" != "X-$enable_fortran"; then
+ echo ' Warning: shared libraries are not supported with Fortran'
+ echo ' Disabling shared libraries'
enable_shared="no"
- ;;
+fi
-esac