summaryrefslogtreecommitdiff
path: root/lldb
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2023-05-15 14:29:20 -0700
committerJonas Devlieghere <jonas@devlieghere.com>2023-05-15 14:32:15 -0700
commit870eb04f1005da8278673f3cd1d1a640d16b63e6 (patch)
tree99a24d4d2a7008425292f0af35d5cc17ce04687b /lldb
parentf464b7c764bcb8f29f28025919800f49405e4e93 (diff)
downloadllvm-870eb04f1005da8278673f3cd1d1a640d16b63e6.tar.gz
[lldb] Set CMAKE_CXX_STANDARD before including LLDBStandalone
Set the C++ language standard before including LLDBStandalone.cmake. Otherwise we risk building some of our dependencies (such as llvm_gtest) without C++ 17 support. This should fix the standalone bot [1] which is currently failing with the following error: test-port.h:841:12: error: no member named 'tuple' in namespace 'std' using std::tuple; [1] https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake-standalone
Diffstat (limited to 'lldb')
-rw-r--r--lldb/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 9ae6722295ac..4a53d7ef3d0d 100644
--- a/lldb/CMakeLists.txt
+++ b/lldb/CMakeLists.txt
@@ -27,11 +27,11 @@ include(GNUInstallDirs)
option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${LLVM_INCLUDE_TESTS})
if(LLDB_BUILT_STANDALONE)
- include(LLDBStandalone)
-
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
set(CMAKE_CXX_STANDARD_REQUIRED YES)
set(CMAKE_CXX_EXTENSIONS NO)
+
+ include(LLDBStandalone)
endif()
include(LLDBConfig)