Skip to content

[interop] Resolve libclangCppInterOp relative to libcppjit at runtime #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronj0 merged 1 commit into from
Aug 18, 2026
Merged

[interop] Resolve libclangCppInterOp relative to libcppjit at runtime #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,11 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(_python_platlib)
set(CPPINTEROP_INSTALL_DIR "${_python_platlib}/cppjit_backend")
set(CPPINTEROP_INSTALL_PREFIX "${_python_platlib}")
else()
set(CPPINTEROP_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cppjit_backend")
set(CPPINTEROP_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
endif()
set(CPPINTEROP_INSTALL_DIR "${CPPINTEROP_INSTALL_PREFIX}/cppjit_backend")

# Include cmake for CppInterOp config and build using ExternalProject.
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AddCppInterOp.cmake)
Expand All @@ -114,11 +115,12 @@ set(INTEROP_SOURCES
add_library(cppjit SHARED ${CPYRT_SOURCES} ${INTEROP_SOURCES})
add_dependencies(cppjit CppInterOp)

# The exact library file the wrapper dlopens and the include dir the
# interpreter boot requires.
# The wrapper anchors these relative spellings at its own load location,
# falling back to the install prefix (see cppinterop_paths()).
target_compile_definitions(cppjit PRIVATE
CPPINTEROP_LIBRARY="${CPPINTEROP_INSTALL_DIR}/lib/libclangCppInterOp${CMAKE_SHARED_LIBRARY_SUFFIX}"
CPPINTEROP_INCLUDE_DIR="${CPPINTEROP_INSTALL_DIR}/include"
CPPINTEROP_INSTALL_PREFIX="${CPPINTEROP_INSTALL_PREFIX}"
CPPINTEROP_LIBRARY="cppjit_backend/lib/libclangCppInterOp${CMAKE_SHARED_LIBRARY_SUFFIX}"
CPPINTEROP_INCLUDE_DIR="cppjit_backend/include"
)

target_include_directories(cppjit PRIVATE
Expand Down
29 changes: 27 additions & 2 deletions src/interop/interop_wrapper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ using namespace cppjit;
#include <csignal>
#include <cstdlib> // for getenv
#include <cstring>
#include <filesystem>
#include <iostream>
#include <map>
#include <mutex>
Expand Down Expand Up @@ -74,13 +75,37 @@ static inline bool is_integral(std::string& s) {
}) == s.end();
}

struct InterOpPaths {
std::string Library;
std::string IncludeDir;
};

// One relative layout, two anchors: prefer CppInterOp next to our own load
// location so wheels relocate; fall back to the build-time install prefix.
static InterOpPaths cppinterop_paths() {
std::filesystem::path anchor = CPPINTEROP_INSTALL_PREFIX;
Comment thread
aaronj0 marked this conversation as resolved.
#ifndef _WIN32
Dl_info info;
if (dladdr((void*)&cppinterop_paths, &info) && info.dli_fname) {
const std::filesystem::path here =
std::filesystem::path(info.dli_fname).parent_path();
std::error_code ec;
if (std::filesystem::exists(here / CPPINTEROP_LIBRARY, ec))
anchor = here;
}
#endif
return {(anchor / CPPINTEROP_LIBRARY).string(),
(anchor / CPPINTEROP_INCLUDE_DIR).string()};
}

class ApplicationStarter {
interop::TInterp_t Interp;

public:
ApplicationStarter() {
std::lock_guard<std::recursive_mutex> Lock(InterOpMutex);
if (!Cpp::LoadDispatchAPI(CPPINTEROP_LIBRARY)) {
const InterOpPaths Paths = cppinterop_paths();
if (!Cpp::LoadDispatchAPI(Paths.Library.c_str())) {
std::cerr << "[cppjit-backend] Failed to load CppInterOp" << std::endl;
return;
}
Expand Down Expand Up @@ -123,7 +148,7 @@ class ApplicationStarter {
Cpp::Process(s.str().c_str());
}

Cpp::AddIncludePath(CPPINTEROP_INCLUDE_DIR);
Cpp::AddIncludePath(Paths.IncludeDir.c_str());
Cpp::LoadLibrary("libstdc++", /* lookup= */ true);

// load frequently used headers
Expand Down
Loading