diff options
| author | Vassil Vassilev <v.g.vassilev@gmail.com> | 2017-06-09 22:09:57 +0000 |
|---|---|---|
| committer | Vassil Vassilev <v.g.vassilev@gmail.com> | 2017-06-09 22:09:57 +0000 |
| commit | d335233fe2186b84b0667d32d1be329112c50f8b (patch) | |
| tree | 642d02071deec3f375430f9cb73dbe07cb35bdae | |
| parent | 35cc699d7ade6dbcfb6f7125b5d62d6c00f279c1 (diff) | |
| download | bcm5719-llvm-d335233fe2186b84b0667d32d1be329112c50f8b.tar.gz bcm5719-llvm-d335233fe2186b84b0667d32d1be329112c50f8b.zip | |
Enable c++1z experimental builds.
Patch by David Abdurachmanov!
llvm-svn: 305123
| -rw-r--r-- | llvm/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | llvm/cmake/modules/HandleLLVMOptions.cmake | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 1d9139a62c3..431785d3dd0 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -385,6 +385,7 @@ else() option(LLVM_ENABLE_LOCAL_SUBMODULE_VISIBILITY "Compile with -fmodules-local-submodule-visibility." ON) endif() option(LLVM_ENABLE_CXX1Y "Compile with C++1y enabled." OFF) +option(LLVM_ENABLE_CXX1Z "Compile with C++1z enabled." OFF) option(LLVM_ENABLE_LIBCXX "Use libc++ if available." OFF) option(LLVM_ENABLE_LLD "Use lld as C and C++ linker." OFF) option(LLVM_ENABLE_PEDANTIC "Compile with pedantic enabled." ON) diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index d15933157d2..c3325db1178 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -385,6 +385,9 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE ) if (LLVM_ENABLE_CXX1Y) check_cxx_compiler_flag("-std=c++1y" CXX_SUPPORTS_CXX1Y) append_if(CXX_SUPPORTS_CXX1Y "-std=c++1y" CMAKE_CXX_FLAGS) + elseif(LLVM_ENABLE_CXX1Z) + check_cxx_compiler_flag("-std=c++1z" CXX_SUPPORTS_CXX1Z) + append_if(CXX_SUPPORTS_CXX1Z "-std=c++1z" CMAKE_CXX_FLAGS) else() check_cxx_compiler_flag("-std=c++11" CXX_SUPPORTS_CXX11) if (CXX_SUPPORTS_CXX11) |
