summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-04-08 22:02:34 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-04-08 22:02:34 (GMT)
commite6cd19937b0e5fe5b49f7e88b08f15305e0b5af1 (patch)
treed60c5e8edd3a1c55f8cc2abdfc2905e505023754
parentb35dcaf84731e72991d0cd1d421fe2d68a065842 (diff)
downloadhdf5-e6cd19937b0e5fe5b49f7e88b08f15305e0b5af1.zip
hdf5-e6cd19937b0e5fe5b49f7e88b08f15305e0b5af1.tar.gz
hdf5-e6cd19937b0e5fe5b49f7e88b08f15305e0b5af1.tar.bz2
Squashed commit of the following:
commit 8963c3bf756f8f8ec21beea9bd29a767e77675a8 Author: Larry Knox <lrknox@hdfgroup.org> Date: Wed Apr 8 16:52:27 2020 -0500 Commit changes to gnu-cxxflags to remove unmatched " and to gnu-fflags to not add C warnings flags to H5_FCFLAGS.
-rw-r--r--config/gnu-cxxflags7
-rw-r--r--config/gnu-fflags2
2 files changed, 5 insertions, 4 deletions
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
index 9ae38f6..73f49ba 100644
--- a/config/gnu-cxxflags
+++ b/config/gnu-cxxflags
@@ -306,9 +306,10 @@ fi
# Version-specific g++ flags
-
- # Append more extra warning flags that only gcc 4.9+ know about
- -Wopenmp-simd"
+# This flag was left behind when moving warnings flags to common files for
+# both autotools and CMake.
+# # Append more extra warning flags that only gcc 4.9+ know about
+# -Wopenmp-simd"
# Clear cxx info if no flags set
if test "X$cxx_flags_set" = "X"; then
diff --git a/config/gnu-fflags b/config/gnu-fflags
index 2859158..f58f10c 100644
--- a/config/gnu-fflags
+++ b/config/gnu-fflags
@@ -139,7 +139,7 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
# General #
###########
- H5_FCFLAGS="$H5_CFLAGS $(load_gnu_arguments gfort-general)"
+ H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-general)"
#############################
# Version-specific warnings #