This is an archive of the discontinued LLVM Phabricator instance.

Differential D67781

Revert "Fix swig python package path"
ClosedPublic

Authored by hhb on Sep 19 2019, 5:41 PM.

Details

Reviewers
JDevlieghere
ZeGentzy
Commits
rG627868ab7c3d: Revert "Fix swig python package path"
rLLDB372364: Revert "Fix swig python package path"
rL372364: Revert "Fix swig python package path"
Summary

This reverts commit 5a115e81cdd40c758b10c382aeffc0c8de6930e2.

Diff Detail

Repository
rL LLVM

Event Timeline

hhb created this revision.Sep 19 2019, 5:41 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 19 2019, 5:41 PM
Herald added subscribers: lldb-commits, mgorny. · View Herald Transcript
Harbormaster completed remote builds in B38308: Diff 220927.Sep 19 2019, 5:42 PM
This revision was not accepted when it landed; it landed in state Needs Review.Sep 19 2019, 5:47 PM
Closed by commit rL372364: Revert "Fix swig python package path" (authored by hhb). · Explain Why
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptSep 19 2019, 5:48 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
trunk/
scripts/
10 lines

Diff 220928

lldb/trunk/scripts/CMakeLists.txt

Show All 36 Linesadd_custom_command(
COMMENT "Python script building LLDB Python wrapper") COMMENT "Python script building LLDB Python wrapper")
add_custom_target(swig_wrapper ALL DEPENDS add_custom_target(swig_wrapper ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
${CMAKE_CURRENT_BINARY_DIR}/lldb.py ${CMAKE_CURRENT_BINARY_DIR}/lldb.py
) )
if(NOT LLDB_BUILD_FRAMEWORK) if(NOT LLDB_BUILD_FRAMEWORK)
# The path here should match the result of python function if(CMAKE_SYSTEM_NAME MATCHES "Windows")
# distutils.sysconfig.get_python_lib(). set(swig_python_subdir site-packages)
if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
set(swig_python_subdir Lib/site-packages)
else() 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() 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}) set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX})
# Install the LLDB python module # Install the LLDB python module
install(DIRECTORY ${SWIG_PYTHON_DIR} DESTINATION ${SWIG_INSTALL_DIR}) install(DIRECTORY ${SWIG_PYTHON_DIR} DESTINATION ${SWIG_INSTALL_DIR})
endif() endif()