Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 350648f

Browse filesBrowse files
chelcassanovachelcassanova
committed
[lldb][cmake] Error out when building debugserver with CMake 4
CMake 4 no longer sets the `CMAKE_OSX_SYSROOT` variable by default. If you've updated to CMake 4 on macOS (e.g. with brew) and try building LLDB with CMake/ninja, this will yield an error when building debugserver that clang is unable to run since it tries to compile files that don't exist. These files are supposed to be generated by the `mig` process. `mig` needs the `CMAKE_OSX_SYSROOT` variable in order to work and without it, it silently fails to generate the files that later on need to be compiled. This commit will fatal error out of config when building debugserver without having set CMAKE_OSX_SYSROOT.
1 parent 76d83e6 commit 350648f
Copy full SHA for 350648f

File tree

Expand file treeCollapse file tree

1 file changed

+14
-1
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+14
-1
lines changed

‎lldb/tools/debugserver/source/CMakeLists.txt

Copy file name to clipboardExpand all lines: lldb/tools/debugserver/source/CMakeLists.txt
+14-1Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,19 @@ endif()
154154

155155
add_definitions(-DLLDB_USE_OS_LOG)
156156

157+
if(CMAKE_OSX_SYSROOT)
158+
set(${MIG_SYSROOT} CMAKE_OSX_SYSROOT)
159+
else()
160+
execute_process(COMMAND xcrun --show-sdk-path
161+
OUTPUT_VARIABLE MIG_SYSROOT
162+
ERROR_QUIET
163+
OUTPUT_STRIP_TRAILING_WHITESPACE)
164+
endif()
165+
166+
if(NOT MIG_SYSROOT)
167+
message(FATAL_ERROR "Unable to obtain macOS SDK root, debugserver cannot be built.")
168+
endif()
169+
157170
if(${CMAKE_OSX_SYSROOT} MATCHES ".Internal.sdk$")
158171
message(STATUS "LLDB debugserver energy support is enabled")
159172
add_definitions(-DLLDB_ENERGY)
@@ -177,7 +190,7 @@ endif()
177190
separate_arguments(MIG_ARCH_FLAGS_SEPARTED NATIVE_COMMAND "${MIG_ARCH_FLAGS}")
178191

179192
add_custom_command(OUTPUT ${generated_mach_interfaces}
180-
VERBATIM COMMAND mig ${MIG_ARCH_FLAGS_SEPARTED} -isysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CURRENT_SOURCE_DIR}/MacOSX/dbgnub-mig.defs
193+
VERBATIM COMMAND mig ${MIG_ARCH_FLAGS_SEPARTED} -isysroot ${MIG_SYSROOT} ${CMAKE_CURRENT_SOURCE_DIR}/MacOSX/dbgnub-mig.defs
181194
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/MacOSX/dbgnub-mig.defs
182195
)
183196

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.