summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-04-21 19:21:24 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-04-21 19:21:24 (GMT)
commit91e56dc68db9b37fb536bac555e95953ba240ac2 (patch)
tree55140e8a869ac834886f90f94dd805ff4be2fd08 /config
parent5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5 (diff)
downloadhdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.zip
hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.tar.gz
hdf5-91e56dc68db9b37fb536bac555e95953ba240ac2.tar.bz2
[svn-r12295] Purpose:
Several bug fixes Description: Added config file for Cray X1 (previous file was misnamed) Simplified some code in hyperslab.c test that seemed to have been confusing compiler on Cray X1. Fixed typo in config/commence.am Cleaned up hl/src/Makefile.am Solution: All four fixes should be straightforward. The failure on Cray was very difficult to debug, but involved arithmetic errors. This change seems to fix it. Platforms tested: heping, copper, sol, some Cray X1 (more testing when system comes back up)
Diffstat (limited to 'config')
-rw-r--r--config/commence.am2
-rw-r--r--config/craynv (renamed from config/nv1-cray)8
2 files changed, 5 insertions, 5 deletions
diff --git a/config/commence.am b/config/commence.am
index e70b50e..8e48df3 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -76,7 +76,7 @@ endif
# but which shouldn't be exported to h5cc for building other programs.
CFLAGS=@CFLAGS@ @H5_CFLAGS@
CPPFLAGS=@CPPFLAGS@ @H5_CPPFLAGS@
-FFLAGS=@FFLAGS@ @H5_FFLAGS@
+FCFLAGS=@FCFLAGS@ @H5_FCFLAGS@
CXXFLAGS=@CXXFLAGS@ @H5_CXXFLAGS@
# The trace script; this is used on source files from the C library to
diff --git a/config/nv1-cray b/config/craynv
index bdd590a..4097f78 100644
--- a/config/nv1-cray
+++ b/config/craynv
@@ -150,10 +150,10 @@ if test "X-" = "X-$f9x_flags_set"; then
# number #. Warning 405 and 412 were stopping the executable from being built.
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
- FFLAGS="$FFLAGS"
- DEBUG_FFLAGS="-g"
- PROD_FFLAGS=""
- PROFILE_FFLAGS=""
+ FCFLAGS="$FCFLAGS -em"
+ DEBUG_FCFLAGS="-g"
+ PROD_FCFLAGS=""
+ PROFILE_FCFLAGS=""
f9x_flags_set=yes
fi