From a8e070366a4df0106a743383616b9194bd129760 Mon Sep 17 00:00:00 2001 From: Chris Bieneman <chris.bieneman@me.com> Date: Wed, 14 Aug 2019 18:26:37 +0000 Subject: [PATCH] [CMake] Fix cache invalidation of LLVM_CXX_STD This cleans up fallout from https://reviews.llvm.org/D66195. llvm-svn: 368897 --- llvm/cmake/modules/HandleLLVMOptions.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index 37ef64f22dc2..893f2a247586 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)