[Lldb-commits] [lldb] r360652 - [CMake] Correctly reinstate LLDB_CAN_USE_LLDB_SERVER

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Tue May 14 01:18:06 PDT 2019


Author: labath
Date: Tue May 14 01:18:06 2019
New Revision: 360652

URL: http://llvm.org/viewvc/llvm-project?rev=360652&view=rev
Log:
[CMake] Correctly reinstate LLDB_CAN_USE_LLDB_SERVER

r360631 introduced a "syntax error" which meant that cmake was still not
honoring the value of LLDB_CAN_USE_LLDB_SERVER variable. The correct
syntax for seting an internal cache variable is "set(VAR value CACHE
INTERNAL)", but the patch omitted the "CACHE" keyword. The "syntax
error" is in quotes because without the CACHE keyword this is still
valid syntax for setting the value of LLDB_CAN_USE_LLDB_SERVER to "1
INTERNAL".

There doesn't seem to be a need for this to be a cache variable so I'm
reverting this variable to a plain one, as it was before r360621.

This will hopefully fix the windows build.

Modified:
    lldb/trunk/cmake/modules/LLDBConfig.cmake

Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=360652&r1=360651&r2=360652&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBConfig.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake Tue May 14 01:18:06 2019
@@ -417,9 +417,9 @@ list(APPEND system_libs ${CMAKE_DL_LIBS}
 # Figure out if lldb could use lldb-server.  If so, then we'll
 # ensure we build lldb-server when an lldb target is being built.
 if (CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|FreeBSD|Linux|NetBSD")
-  set(LLDB_CAN_USE_LLDB_SERVER 1 INTERNAL)
+  set(LLDB_CAN_USE_LLDB_SERVER 1)
 else()
-  set(LLDB_CAN_USE_LLDB_SERVER 0 INTERNAL)
+  set(LLDB_CAN_USE_LLDB_SERVER 0)
 endif()
 
 # Figure out if lldb could use debugserver.  If so, then we'll




More information about the lldb-commits mailing list