diff --git a/CMakeLists.txt b/CMakeLists.txt index a6345c3e1157..35b0c7699d22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -497,11 +497,7 @@ option(CIRCT_BINDINGS_PYTHON_ENABLED "Enables CIRCT Python bindings." OFF) if(CIRCT_BINDINGS_PYTHON_ENABLED) message(STATUS "CIRCT Python bindings are enabled.") set(MLIR_DISABLE_CONFIGURE_PYTHON_DEV_PACKAGES 0) - mlir_detect_nanobind_install() - # Prime the search like mlir_configure_python_dev_modules - find_package(Python3 3.8 COMPONENTS Interpreter Development) - find_package(Python3 3.8 COMPONENTS Interpreter Development.Module) - find_package(nanobind 2.4.0 CONFIG REQUIRED) + mlir_configure_python_dev_packages() else() message(STATUS "CIRCT Python bindings are disabled.") # Lookup python either way as some integration tests use python without the diff --git a/lib/Bindings/Python/CMakeLists.txt b/lib/Bindings/Python/CMakeLists.txt index 9e8812686181..9a29c811c152 100644 --- a/lib/Bindings/Python/CMakeLists.txt +++ b/lib/Bindings/Python/CMakeLists.txt @@ -82,8 +82,6 @@ declare_mlir_python_extension(CIRCTBindingsPythonExtension ${PYTHON_BINDINGS_LINK_LIBS} PRIVATE_LINK_LIBS LLVMSupport - PYTHON_BINDINGS_LIBRARY - nanobind ) if (CIRCT_INCLUDE_TESTS) diff --git a/llvm b/llvm index b32e067e9700..68d6a2fd6165 160000 --- a/llvm +++ b/llvm @@ -1 +1 @@ -Subproject commit b32e067e97003db47aed52edc9ef8c3c30899b91 +Subproject commit 68d6a2fd61657c29df3fd6d16f85282f5ef36d2f