diff options
| author | Chris Bieneman <chris.bieneman@me.com> | 2019-08-14 18:26:37 +0000 |
|---|---|---|
| committer | Chris Bieneman <chris.bieneman@me.com> | 2019-08-14 18:26:37 +0000 |
| commit | a8e070366a4df0106a743383616b9194bd129760 (patch) | |
| tree | d02e9d9b71d49109acc73b3b2d943af7433c432d | |
| parent | ef56c7cdf01e322b063599dec6ded7e436415463 (diff) | |
| download | bcm5719-llvm-a8e070366a4df0106a743383616b9194bd129760.tar.gz bcm5719-llvm-a8e070366a4df0106a743383616b9194bd129760.zip | |
[CMake] Fix cache invalidation of LLVM_CXX_STD
This cleans up fallout from https://reviews.llvm.org/D66195.
llvm-svn: 368897
| -rw-r--r-- | llvm/cmake/modules/HandleLLVMOptions.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index 37ef64f22dc..893f2a24758 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -23,8 +23,11 @@ set(LLVM_CXX_STD_default "c++14") if (LLVM_ENABLE_CXX1Z) set(LLVM_CXX_STD_default "c++1z") endif() +if (LLVM_CXX_STD STREQUAL "c++11") + set(LLVM_CXX_STD_force FORCE) +endif() set(LLVM_CXX_STD ${LLVM_CXX_STD_default} - CACHE STRING "C++ standard to use for compilation.") + CACHE STRING "C++ standard to use for compilation." ${LLVM_CXX_STD_force}) set(LLVM_ENABLE_LTO OFF CACHE STRING "Build LLVM with LTO. May be specified as Thin or Full to use a particular kind of LTO") string(TOUPPER "${LLVM_ENABLE_LTO}" uppercase_LLVM_ENABLE_LTO) |
