diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-04-30 22:02:27 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-04-30 22:02:27 (GMT) |
| commit | a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d (patch) | |
| tree | 34bb4b6df999a88fc43f7f56bc80e7e1c7876532 /config/gnu-cxxflags | |
| parent | 0801609ac2acba1b221f5cc29623d6d58eee97d8 (diff) | |
| parent | f80019dfda61ba42c189277dc16643648e23553d (diff) | |
| download | hdf5-a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d.zip hdf5-a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d.tar.gz hdf5-a4553b35e1e2dae2e5f99cfd2286b1c89f84b43d.tar.bz2 | |
Merge pull request #2556 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8 to hdf5_1_8
* commit 'f80019dfda61ba42c189277dc16643648e23553d':
Update config/gnu-cxxflags.
Update to use optimization flags, C++ error flags, and correct libhdf5.settings.in to remove unworkable changes.
Diffstat (limited to 'config/gnu-cxxflags')
| -rw-r--r-- | config/gnu-cxxflags | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags index b2ef36d..99480c5 100644 --- a/config/gnu-cxxflags +++ b/config/gnu-cxxflags @@ -121,15 +121,27 @@ if test "X-g++" = "X-$cxx_vendor"; then # C++-specific H5_CXXFLAGS="$H5_CXXFLAGS $arch" + ################ + # Optimization # + ################ + + if test $cxx_vers_major -le 4; then + HIGH_OPT_CXXFLAGS="-O3" + DEBUG_OPT_CXXFLAGS= + else + HIGH_OPT_CXXFLAGS="-O3" + DEBUG_OPT_CXXFLAGS="-Og" + fi + ############## # Production # ############## # NDEBUG is handled explicitly by the configure script if test $cxx_vers_major -le 4; then - PROD_CXXFLAGS= + PROD_CXXFLAGS=$HIGH_OPT_CXXFLAGS else - PROD_CXXFLAGS="-fstdarg-opt" + PROD_CXXFLAGS=$HIGH_OPT_CXXFLAGS "-fstdarg-opt" fi ######### @@ -139,9 +151,9 @@ if test "X-g++" = "X-$cxx_vendor"; then # NDEBUG is handled explicitly by the configure script # -g is handled by the symbols flags if test $cxx_vers_major -le 4; then - DEBUG_CXXFLAGS= + DEBUG_CXXFLAGS=$DEBUG_OPT_CXXFLAGS else - DEBUG_CXXFLAGS="-ftrapv -fno-common" + DEBUG_CXXFLAGS=$DEBUG_OPT_CXXFLAGS "-ftrapv -fno-common" fi ########### @@ -157,19 +169,6 @@ if test "X-g++" = "X-$cxx_vendor"; then PROFILE_CXXFLAGS="-pg" - ################ - # Optimization # - ################ - - if test $cxx_vers_major -le 4; then - HIGH_OPT_CXXFLAGS="-O3" - DEBUG_OPT_CXXFLAGS= - else - HIGH_OPT_CXXFLAGS="-O3" - DEBUG_OPT_CXXFLAGS="-Og" - fi - NO_OPT_CXXFLAGS="-O0" - ############ # Warnings # ############ |