From: Chris Bieneman <chris.bieneman@me.com>
Date: Wed, 14 Aug 2019 18:26:37 +0000 (+0000)
Subject: [CMake] Fix cache invalidation of LLVM_CXX_STD
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=874a0a3b9d31e438555bf5a349ce743dd2ba492e;p=llvm

[CMake] Fix cache invalidation of LLVM_CXX_STD

This cleans up fallout from https://reviews.llvm.org/D66195.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368897 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index 37ef64f22dc..893f2a24758 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/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)