[Lldb-commits] [lldb] 0f2a7f2 - [debugserver] Put building for arm64e behind a CMake flag

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2021-11-08T21:01:43-08:00
New Revision: 0f2a7f2955cc632846ed8cd17865d887795eb0b3

URL: https://github.com/llvm/llvm-project/commit/0f2a7f2955cc632846ed8cd17865d887795eb0b3
DIFF: https://github.com/llvm/llvm-project/commit/0f2a7f2955cc632846ed8cd17865d887795eb0b3.diff

LOG: [debugserver] Put building for arm64e behind a CMake flag

Added: 
    

Modified: 
    lldb/tools/debugserver/source/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt
index cf1eea31cdb8d..86ad62de6088a 100644
--- a/lldb/tools/debugserver/source/CMakeLists.txt
+++ b/lldb/tools/debugserver/source/CMakeLists.txt
@@ -82,8 +82,6 @@ if (CXX_SUPPORTS_NO_EXTENDED_OFFSETOF)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof")
 endif ()
 
-# When compiling for arm, build debugserver 2 way fat with an arm64 and arm64e
-# slice. You can only debug arm64e processes using an arm64e debugserver.
 include(CheckCSourceCompiles)
 check_c_source_compiles(
     "
@@ -102,7 +100,9 @@ check_c_source_compiles(
     BUILDING_FOR_ARM64_OSX
 )
 
-if (BUILDING_FOR_ARM64_OSX)
+# You can only debug arm64e processes using an arm64e debugserver.
+option(LLDB_ENABLE_ARM64E_DEBUGSERVER "Build debugserver for arm64 and arm64e" OFF)
+if (BUILDING_FOR_ARM64_OSX AND LLDB_ENABLE_ARM64E_DEBUGSERVER)
   set(CMAKE_OSX_ARCHITECTURES "arm64;arm64e")
 endif ()