diff options
| author | Ye Luo <yeluo@anl.gov> | 2021-07-23 17:28:53 -0400 |
|---|---|---|
| committer | Shilei Tian <tianshilei1992@gmail.com> | 2021-07-23 17:29:08 -0400 |
| commit | 4079037a3e11506e035b98b906a907cc5b60c1e7 (patch) | |
| tree | 854b2425a78c10c707b745b6a93f2f3ade2af365 /openmp/cmake | |
| parent | 943f85123b72720c1c960c6dee7d20ff1c37ea52 (diff) | |
| download | llvm-4079037a3e11506e035b98b906a907cc5b60c1e7.tar.gz | |
[OpenMP] always compile with c++14 instead of gnu++14
Fixes PR 51174. c++14 should be a more portable option than gnu++14.
Reviewed By: tianshilei1992
Differential Revision: https://reviews.llvm.org/D106632
Diffstat (limited to 'openmp/cmake')
| -rw-r--r-- | openmp/cmake/HandleOpenMPOptions.cmake | 5 | ||||
| -rw-r--r-- | openmp/cmake/config-ix.cmake | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/openmp/cmake/HandleOpenMPOptions.cmake b/openmp/cmake/HandleOpenMPOptions.cmake index 15382bcf12de..db3a5bf795e1 100644 --- a/openmp/cmake/HandleOpenMPOptions.cmake +++ b/openmp/cmake/HandleOpenMPOptions.cmake @@ -29,7 +29,4 @@ append_if(OPENMP_HAVE_WNO_EXTRA_FLAG "-Wno-extra" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append_if(OPENMP_HAVE_WNO_PEDANTIC_FLAG "-Wno-pedantic" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) append_if(OPENMP_HAVE_WNO_MAYBE_UNINITIALIZED_FLAG "-Wno-maybe-uninitialized" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) -append_if(OPENMP_HAVE_STD_GNUPP14_FLAG "-std=gnu++14" CMAKE_CXX_FLAGS) -if (NOT OPENMP_HAVE_STD_GNUPP14_FLAG) - append_if(OPENMP_HAVE_STD_CPP14_FLAG "-std=c++14" CMAKE_CXX_FLAGS) -endif() +append_if(OPENMP_HAVE_STD_CPP14_FLAG "-std=c++14" CMAKE_CXX_FLAGS) diff --git a/openmp/cmake/config-ix.cmake b/openmp/cmake/config-ix.cmake index d9ea3bbb0574..b7c254ae6158 100644 --- a/openmp/cmake/config-ix.cmake +++ b/openmp/cmake/config-ix.cmake @@ -14,5 +14,4 @@ check_cxx_compiler_flag(-Wno-extra OPENMP_HAVE_WNO_EXTRA_FLAG) check_cxx_compiler_flag(-Wno-pedantic OPENMP_HAVE_WNO_PEDANTIC_FLAG) check_cxx_compiler_flag(-Wno-maybe-uninitialized OPENMP_HAVE_WNO_MAYBE_UNINITIALIZED_FLAG) -check_cxx_compiler_flag(-std=gnu++14 OPENMP_HAVE_STD_GNUPP14_FLAG) check_cxx_compiler_flag(-std=c++14 OPENMP_HAVE_STD_CPP14_FLAG) |