diff options
Diffstat (limited to 'config/intel-cxxflags')
| -rw-r--r-- | config/intel-cxxflags | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/config/intel-cxxflags b/config/intel-cxxflags index 900bcb9..107b087 100644 --- a/config/intel-cxxflags +++ b/config/intel-cxxflags @@ -94,7 +94,7 @@ if test "X-icpc" = "X-$cxx_vendor"; then # Debug # ######### - # NDEBUG is handled explicitly by the configure script + # NDEBUG is handled explicitly in configure # -g is handled by the symbols flags DEBUG_CXXFLAGS= @@ -123,19 +123,19 @@ if test "X-icpc" = "X-$cxx_vendor"; then # Warnings # ############ -# First load the C warnings then add CXX warnings (if needed) - ########### # General # ########### # Add various general warning flags in intel-warnings. + # Use the C warnings as CXX warnings are the same H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments general)" ###################### # Developer warnings # ###################### + # Use the C warnings as CXX warnings are the same #NO_DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments no-developer-general) #DEVELOPER_WARNING_CXXFLAGS=$(load_intel_arguments developer-general) @@ -144,21 +144,34 @@ if test "X-icpc" = "X-$cxx_vendor"; then ############################# # intel == 8.0 - if test $cc_vers_major -eq 8 -a $cc_vers_minor -eq 0; then + if test $cxx_vers_major -eq 8 -a $cxx_vers_minor -eq 0; then # v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2. HIGH_OPT_CFLAGS="-O2" fi # intel == 10 - if test $cc_vers_major -eq 10; then + if test $cxx_vers_major -eq 10; then HIGH_OPT_CFLAGS="-O1" fi # intel >= 15 - if test $cc_vers_major -ge 15; then + if test $cxx_vers_major -ge 15; then + # Use the C warnings as CXX warnings are the same H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments 15)" fi + # intel >= 18 + if test $cxx_vers_major -ge 18; then + # Use the C warnings as CXX warnings are the same + H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments 18)" + fi + + # intel <= 19 + if test $cxx_vers_major -le 19; then + # Use the C warnings as CXX warnings are the same + H5_CXXFLAGS="$H5_CXXFLAGS $(load_intel_arguments general-19)" + fi + ################# # Flags are set # ################# |