Skip to content

Revert PR #18386 #18446

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
merged 2 commits into from
Apr 18, 2025
Merged

Revert PR #18386 #18446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
587386a
Revert "[CMake] Improve Clang directory deduction in `core/clingutils`"
hahnjo Apr 18, 2025
b5322e6
Revert "[CMake] Disable linking against shared LLVM also for builtin_…
hahnjo Apr 18, 2025
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
26 changes: 19 additions & 7 deletions core/clingutils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,31 @@ foreach(dict ${stldicts})
target_include_directories(${dict}Dict PRIVATE ${CMAKE_SOURCE_DIR}/interpreter/cling/include/cling/cint)
endforeach()

set(CLANG_RESOURCE_DIR_STEM)
if (builtin_clang)
set(CLANG_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/interpreter/llvm-project/llvm/${CMAKE_CFG_INTDIR})
set(CLANG_RESOURCE_DIR_STEM ${CMAKE_BINARY_DIR}/interpreter/llvm-project/llvm/${CMAKE_CFG_INTDIR}/lib/clang)
set(CLANG_RESOURCE_DIR_VERSION ${LLVM_VERSION_MAJOR})
else ()
# If no explicit Clang prefix is set, assume it lives inside LLVM prefix.
if(NOT DEFINED CLANG_INSTALL_PREFIX)
set(CLANG_INSTALL_PREFIX ${LLVM_DIR})
set(CLANG_RESOURCE_DIR_STEM ${LLVM_LIBRARY_DIR}/clang)
# A user can define a clang version to use, otherwise find it (but will error if more than one version is present)
if (NOT DEFINED CLANG_RESOURCE_DIR_VERSION)
if (NOT EXISTS ${CLANG_RESOURCE_DIR_STEM})
message(FATAL_ERROR "${CLANG_RESOURCE_DIR_STEM} does not exist. Please install clang.")
endif()
# There is no reasonable way to get the version of clang under which is its resource directory.
# For example, lib/clang/5.0.0/include. Deduce it.
file(GLOB CHILDREN RELATIVE ${CLANG_RESOURCE_DIR_STEM} ${CLANG_RESOURCE_DIR_STEM}/*)
list(LENGTH CHILDREN CHILDREN_LENGTH)
if (${CHILDREN_LENGTH} GREATER 1)
message(FATAL_ERROR "Found more than one version of clang. CLANG_RESOURCE_DIR_VERSION contains: '${CHILDREN}'." )
endif()

list(GET CHILDREN 0 CLANG_RESOURCE_DIR_VERSION)
endif()
endif()

# We only look for the Clang version that matches the LLVM version, because other setups are not supported.
set(CLANG_RESOURCE_DIR_VERSION ${LLVM_VERSION_MAJOR})

set(CLANG_RESOURCE_DIR ${CLANG_INSTALL_PREFIX}/lib/clang/${CLANG_RESOURCE_DIR_VERSION}/include)
set(CLANG_RESOURCE_DIR ${CLANG_RESOURCE_DIR_STEM}/${CLANG_RESOURCE_DIR_VERSION}/include)

#---Deal with clang resource here----------------------------------------------
install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/cling/lib/clang/${CLANG_RESOURCE_DIR_VERSION}/include/
Expand Down
6 changes: 0 additions & 6 deletions interpreter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,6 @@ if (builtin_clang)
else()
find_package(Clang REQUIRED CONFIG)
message(STATUS "Found Clang ${CLANG_PACKAGE_VERSION} in ${CLANG_CMAKE_DIR}")

# Disable linking against shared LLVM.
# We have to do this after find_package(Clang). Finding Clang internally
# calls find_package(LLVM), which overwrites LLVM_LINK_LLVM_DYLIB to what it
# was set when building LLVM.
set(LLVM_LINK_LLVM_DYLIB FALSE)
endif()

# Reset the compiler flags after compiling LLVM and Clang
Expand Down
Loading