This revision was automatically updated to reflect the committed changes. Closed by commit rGae389b2450bd: [lldb] use EXT_SUFFIX for python extension (authored by lawrence_danna).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D112972/new/ https://reviews.llvm.org/D112972 Files: lldb/CMakeLists.txt lldb/bindings/python/CMakeLists.txt lldb/bindings/python/get-python-config.py Index: lldb/bindings/python/get-python-config.py =================================================================== --- lldb/bindings/python/get-python-config.py +++ lldb/bindings/python/get-python-config.py @@ -39,9 +39,10 @@ print("tried:", e, file=sys.stderr) print("sys.prefix:", sys.prefix, file=sys.stderr) sys.exit(1) - + elif args.variable_name == "LLDB_PYTHON_EXT_SUFFIX": + print(sysconfig.get_config_var('EXT_SUFFIX')) else: parser.error(f"unknown variable {args.variable_name}") if __name__ == '__main__': main() \ No newline at end of file Index: lldb/bindings/python/CMakeLists.txt =================================================================== --- lldb/bindings/python/CMakeLists.txt +++ lldb/bindings/python/CMakeLists.txt @@ -149,15 +149,7 @@ else() set(LIBLLDB_SYMLINK_DEST "${LLVM_SHLIB_OUTPUT_INTDIR}/liblldb${CMAKE_SHARED_LIBRARY_SUFFIX}") endif() - if(WIN32) - if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb_d.pyd") - else() - set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb.pyd") - endif() - else() - set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb.so") - endif() + set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb${LLDB_PYTHON_EXT_SUFFIX}") create_relative_symlink(${swig_target} ${LIBLLDB_SYMLINK_DEST} ${lldb_python_target_dir} ${LIBLLDB_SYMLINK_OUTPUT_FILE}) Index: lldb/CMakeLists.txt =================================================================== --- lldb/CMakeLists.txt +++ lldb/CMakeLists.txt @@ -35,8 +35,10 @@ "Path where Python modules are installed, relative to install prefix") set(cachestring_LLDB_PYTHON_EXE_RELATIVE_PATH "Path to python interpreter exectuable, relative to install prefix") + set(cachestring_LLDB_PYTHON_EXT_SUFFIX + "Filename extension for native code python modules") - foreach(var LLDB_PYTHON_RELATIVE_PATH LLDB_PYTHON_EXE_RELATIVE_PATH) + foreach(var LLDB_PYTHON_RELATIVE_PATH LLDB_PYTHON_EXE_RELATIVE_PATH LLDB_PYTHON_EXT_SUFFIX) if(NOT DEFINED ${var} AND NOT CMAKE_CROSSCOMPILING) execute_process( COMMAND ${Python3_EXECUTABLE}
Index: lldb/bindings/python/get-python-config.py =================================================================== --- lldb/bindings/python/get-python-config.py +++ lldb/bindings/python/get-python-config.py @@ -39,9 +39,10 @@ print("tried:", e, file=sys.stderr) print("sys.prefix:", sys.prefix, file=sys.stderr) sys.exit(1) - + elif args.variable_name == "LLDB_PYTHON_EXT_SUFFIX": + print(sysconfig.get_config_var('EXT_SUFFIX')) else: parser.error(f"unknown variable {args.variable_name}") if __name__ == '__main__': main() \ No newline at end of file Index: lldb/bindings/python/CMakeLists.txt =================================================================== --- lldb/bindings/python/CMakeLists.txt +++ lldb/bindings/python/CMakeLists.txt @@ -149,15 +149,7 @@ else() set(LIBLLDB_SYMLINK_DEST "${LLVM_SHLIB_OUTPUT_INTDIR}/liblldb${CMAKE_SHARED_LIBRARY_SUFFIX}") endif() - if(WIN32) - if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb_d.pyd") - else() - set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb.pyd") - endif() - else() - set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb.so") - endif() + set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb${LLDB_PYTHON_EXT_SUFFIX}") create_relative_symlink(${swig_target} ${LIBLLDB_SYMLINK_DEST} ${lldb_python_target_dir} ${LIBLLDB_SYMLINK_OUTPUT_FILE}) Index: lldb/CMakeLists.txt =================================================================== --- lldb/CMakeLists.txt +++ lldb/CMakeLists.txt @@ -35,8 +35,10 @@ "Path where Python modules are installed, relative to install prefix") set(cachestring_LLDB_PYTHON_EXE_RELATIVE_PATH "Path to python interpreter exectuable, relative to install prefix") + set(cachestring_LLDB_PYTHON_EXT_SUFFIX + "Filename extension for native code python modules") - foreach(var LLDB_PYTHON_RELATIVE_PATH LLDB_PYTHON_EXE_RELATIVE_PATH) + foreach(var LLDB_PYTHON_RELATIVE_PATH LLDB_PYTHON_EXE_RELATIVE_PATH LLDB_PYTHON_EXT_SUFFIX) if(NOT DEFINED ${var} AND NOT CMAKE_CROSSCOMPILING) execute_process( COMMAND ${Python3_EXECUTABLE}
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits