[Lldb-commits] [PATCH] D67781: Revert "Fix swig python package path"

Haibo Huang via Phabricator via lldb-commits lldb-commits at lists.llvm.org
Thu Sep 19 17:42:46 PDT 2019


hhb created this revision.
hhb added reviewers: JDevlieghere, ZeGentzy.
Herald added subscribers: lldb-commits, mgorny.
Herald added a project: LLDB.

This reverts commit 5a115e81cdd40c758b10c382aeffc0c8de6930e2 <https://reviews.llvm.org/rG5a115e81cdd40c758b10c382aeffc0c8de6930e2>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D67781

Files:
  lldb/scripts/CMakeLists.txt


Index: lldb/scripts/CMakeLists.txt
===================================================================
--- lldb/scripts/CMakeLists.txt
+++ lldb/scripts/CMakeLists.txt
@@ -42,15 +42,13 @@
 )
 
 if(NOT LLDB_BUILD_FRAMEWORK)
-  # The path here should match the result of python function
-  # distutils.sysconfig.get_python_lib().
-  if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
-    set(swig_python_subdir Lib/site-packages)
+  if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+    set(swig_python_subdir site-packages)
   else()
-    set(swig_python_subdir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+    set(swig_python_subdir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
   endif()
 
-  set(SWIG_PYTHON_DIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${swig_python_subdir})
+  set(SWIG_PYTHON_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${swig_python_subdir})
   set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX})
 
   # Install the LLDB python module


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67781.220927.patch
Type: text/x-patch
Size: 951 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20190920/40c9b113/attachment.bin>


More information about the lldb-commits mailing list