Skip to content

[interop] Detect the resource dir of the required system LLVM #32

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 20, 2026
Merged

[interop] Detect the resource dir of the required system LLVM #32

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
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,13 @@ add_library(cppjit SHARED ${CPYRT_SOURCES} ${INTEROP_SOURCES})
add_dependencies(cppjit CppInterOp)

# The wrapper anchors these relative spellings at its own load location,
# falling back to the install prefix (see cppinterop_paths()).
# falling back to the install prefix (see cppinterop_paths()); the clang
# major names the versioned compiler probed for the runtime resource dir.
target_compile_definitions(cppjit PRIVATE
CPPINTEROP_INSTALL_PREFIX="${CPPINTEROP_INSTALL_PREFIX}"
CPPINTEROP_LIBRARY="cppjit_backend/lib/libclangCppInterOp${CMAKE_SHARED_LIBRARY_SUFFIX}"
CPPINTEROP_INCLUDE_DIR="cppjit_backend/include"
CPPJIT_CLANG_MAJOR="${LLVM_VERSION_MAJOR}"
)

target_include_directories(cppjit PRIVATE
Expand Down
21 changes: 15 additions & 6 deletions src/interop/interop_wrapper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,22 @@ static interop::TInterp_t acquireOrCreateInterpreter() {
if (auto existingInterp = Cpp::GetInterpreter())
return existingInterp;

#if defined(__arm64__) && defined(__APPLE__)
// If on apple silicon don't use -march=native
return Cpp::CreateInterpreter({"-std=c++17"}, /*GpuArgs=*/{});
#else
return Cpp::CreateInterpreter({"-std=c++17", "-march=native"},
/*GpuArgs=*/{});
std::vector<const char*> args = {"-std=c++17"};
#if !(defined(__arm64__) && defined(__APPLE__))
// apple silicon clang rejects -march=native
args.push_back("-march=native");
#endif
// Without clang's builtin headers the interpreter fails at its first
// #include. CppInterOp probes only bare `clang`; when just
// clang-<major> is installed, resolve and pass it explicitly.
std::string resourceDir;
if (Cpp::DetectResourceDir("clang").empty())
resourceDir = Cpp::DetectResourceDir("clang-" CPPJIT_CLANG_MAJOR);
if (!resourceDir.empty()) {
args.push_back("-resource-dir");
args.push_back(resourceDir.c_str());
}
return Cpp::CreateInterpreter(args, /*GpuArgs=*/{});
}

static void configureInterpreter(const InterOpPaths& Paths) {
Expand Down
Loading