[Lldb-commits] [lldb] 8c8ffd4 - [lldb/CMake] Only set PYTHON_HOME on Windows
Jonas Devlieghere via lldb-commits
lldb-commits at lists.llvm.org
Mon Jan 6 10:07:52 PST 2020
Author: Jonas Devlieghere
Date: 2020-01-06T10:07:46-08:00
New Revision: 8c8ffd461d16681cb1fc764bedfa8b09fde260aa
URL: https://github.com/llvm/llvm-project/commit/8c8ffd461d16681cb1fc764bedfa8b09fde260aa
DIFF: https://github.com/llvm/llvm-project/commit/8c8ffd461d16681cb1fc764bedfa8b09fde260aa.diff
LOG: [lldb/CMake] Only set PYTHON_HOME on Windows
My earlier change for Python auto-detection caused PYTHON_HOME to be set
unconditionally, while before the change this only happened for Windows.
This caused the PythonDataObjectsTest to fail with an import error.
Added:
Modified:
lldb/cmake/modules/LLDBConfig.cmake
Removed:
################################################################################
diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
index 12fb97fc9d7d..f318b5c8bd2a 100644
--- a/lldb/cmake/modules/LLDBConfig.cmake
+++ b/lldb/cmake/modules/LLDBConfig.cmake
@@ -135,7 +135,7 @@ endif()
if (LLDB_ENABLE_PYTHON)
include_directories(${PYTHON_INCLUDE_DIRS})
- if (NOT LLDB_RELOCATABLE_PYTHON)
+ if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" AND NOT LLDB_RELOCATABLE_PYTHON)
get_filename_component(PYTHON_HOME "${PYTHON_EXECUTABLE}" DIRECTORY)
file(TO_CMAKE_PATH "${PYTHON_HOME}" LLDB_PYTHON_HOME)
endif()
More information about the lldb-commits
mailing list