Author: Adrian Prantl Date: 2020-07-06T13:17:31-07:00 New Revision: 60c07fd016a3a5f2050828f92257e1e5d33a485b
URL: https://github.com/llvm/llvm-project/commit/60c07fd016a3a5f2050828f92257e1e5d33a485b DIFF: https://github.com/llvm/llvm-project/commit/60c07fd016a3a5f2050828f92257e1e5d33a485b.diff LOG: Use CMAKE_OSX_SYSROOT instead of the environment variable SYSROOT to detect energy support in debugserver. The way that Swift build-script is invoked the former may be overridden manually. <rdar://problem/63840635> 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 6c4fa026092b..9a7e2eb9a1a0 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -129,7 +129,7 @@ if(LLDB_USE_ENTITLEMENTS) endif() endif() -if($ENV{SDKROOT} MATCHES ".Internal.sdk$") +if(${CMAKE_OSX_SYSROOT} MATCHES ".Internal.sdk$") message(STATUS "LLDB debugserver energy support is enabled") add_definitions(-DLLDB_ENERGY) set(ENERGY_LIBRARY -lpmenergy -lpmsample) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
