summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2018-07-18 22:15:42 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2018-07-18 22:15:42 (GMT)
commit64d8a679438938fe456d5f506b9828d7d8aa2db0 (patch)
treee8bedac256be655283ae7866514537bb28889d30 /config
parentdfc06f79489da8609ea32a2794d76782502cf2fd (diff)
parent3c6654921000a8659276f1fcb32dd0ada1353558 (diff)
downloadhdf5-64d8a679438938fe456d5f506b9828d7d8aa2db0.zip
hdf5-64d8a679438938fe456d5f506b9828d7d8aa2db0.tar.gz
hdf5-64d8a679438938fe456d5f506b9828d7d8aa2db0.tar.bz2
Merge pull request #1143 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '3c6654921000a8659276f1fcb32dd0ada1353558': Apply Cygwin pathches from Marco Atzeri. Commit Joe Lee's typo corrections for src/H5MF.c.
Diffstat (limited to 'config')
-rw-r--r--config/gnu-flags14
1 files changed, 13 insertions, 1 deletions
diff --git a/config/gnu-flags b/config/gnu-flags
index 2f2e428..ac054bf 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -84,6 +84,18 @@ case "$cc_vendor-$cc_version" in
;;
esac
+ case "$host_os-$host_cpu" in
+ # cygwin needs the "-std-c99" flag removed, so make
+ # a specific case for Cygwin without the flag and a default
+ # case to add the flag everywhere else
+ cygwin-*)
+ ;;
+
+ *)
+ H5_CFLAGS="$H5_CFLAGS -std=c99"
+ ;;
+ esac
+
# Host-specific flags
case "`hostname`" in
sleipnir.ncsa.uiuc.edu)
@@ -101,7 +113,7 @@ case "$cc_vendor-$cc_version" in
# NOTE: Don't add -Wpadded here since we can't/won't fix the (many)
# warnings that are emitted. If you need it, add it from the
# environment variable at configure time.
- H5_CFLAGS="$H5_CFLAGS $arch -std=c99 -pedantic -Wall -Wextra -Wbad-function-cast -Wc++-compat -Wcast-align"
+ H5_CFLAGS="$H5_CFLAGS $arch -pedantic -Wall -Wextra -Wbad-function-cast -Wc++-compat -Wcast-align"
H5_CFLAGS="$H5_CFLAGS -Wcast-qual -Wconversion -Wdeclaration-after-statement -Wdisabled-optimization -Wfloat-equal"
H5_CFLAGS="$H5_CFLAGS -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-declarations -Wmissing-include-dirs"
H5_CFLAGS="$H5_CFLAGS -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpacked -Wpointer-arith"