Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CMAKE_CXX_STANDARD=23
builtin_llvm=OFF
test_distrdf_pyspark=OFF
1 change: 1 addition & 0 deletions .github/workflows/root-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
env:
GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }}
OVERRIDES: ${{ join( matrix.overrides, ' ') }}
run: |

Check failure on line 160 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files

"github.event.pull_request.head.ref" is potentially untrusted. avoid using it directly in inline scripts. instead, pass it through an environment variable. see https://docs.github.com/en/actions/reference/security/secure-use#good-practices-for-mitigating-script-injection-attacks for more details
[ -d "${VIRTUAL_ENV_DIR}" ] && source ${VIRTUAL_ENV_DIR}/bin/activate
echo "Python is now $(which python3) $(python3 --version)"
src/.github/workflows/root-ci-config/build_root.py \
Expand Down Expand Up @@ -300,7 +300,7 @@
INCREMENTAL: ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') }}
GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }}
shell: cmd
run: "C:\\setenv.bat ${{ matrix.target_arch }} &&

Check failure on line 303 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files

"github.event.pull_request.head.ref" is potentially untrusted. avoid using it directly in inline scripts. instead, pass it through an environment variable. see https://docs.github.com/en/actions/reference/security/secure-use#good-practices-for-mitigating-script-injection-attacks for more details
python .github/workflows/root-ci-config/build_root.py
--buildtype ${{ matrix.config }}
--platform windows10
Expand Down Expand Up @@ -413,6 +413,7 @@
- image: ubuntu2610
- image: debian13
overrides: ["dev=ON", "CMAKE_CXX_FLAGS=-Wsuggest-override"]
- image: debiantesting
# Special builds
- image: alma9
platform_config: alma9-modules_off
Expand Down Expand Up @@ -468,7 +469,7 @@
- self-hosted
- linux
- ${{ matrix.architecture == null && 'x64' || matrix.architecture }}
- ${{ matrix.extra-runs-on == null && 'cpu' || matrix.extra-runs-on }}

Check failure on line 472 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files

property "extra-runs-on" is not defined in object type {architecture: string; image: string; is_special: bool; overrides: array<string>; platform_config: string; property: string; python_venv: string}

Check failure on line 472 in .github/workflows/root-ci.yml

View workflow job for this annotation

GitHub Actions / lint-action-files

property "extra-runs-on" is not defined in object type {architecture: string; image: string; is_special: bool; overrides: array<string>; platform_config: string; property: string; python_venv: string}

name: |
${{ matrix.image }} ${{ matrix.property }}
Expand Down
20 changes: 18 additions & 2 deletions interpreter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -393,14 +393,26 @@ else()

# Disable linking against shared LLVM
set(LLVM_LINK_LLVM_DYLIB OFF)
# To ensure this override stays constant, we need to avoid subdirectories calling find_package(LLVM),
# which would set it to ON again if system was compiled that way
# Define a macro with a toggle flag to override find_package, that will only be visible in this scope, not in parent one.
macro(find_package _package_name)
if(SKIP_FIND_LLVM AND "${_package_name}" STREQUAL "LLVM")
message(STATUS "[ROOT] Prevented secondary find_package(LLVM) call to save overrides.")
else()
_find_package(${_package_name} ${ARGN})
endif()
endmacro()

# Always build LLVM with C++17. It is not necessary to compile with the same
# C++ standard as the rest of ROOT and sometimes it doesn't even work.
set(_cxx_standard ${CMAKE_CXX_STANDARD})
set(CMAKE_CXX_STANDARD 17)

set(SKIP_FIND_LLVM ON)
add_subdirectory(llvm-project/clang EXCLUDE_FROM_ALL)

set(SKIP_FIND_LLVM OFF)

set(CMAKE_CXX_STANDARD ${_cxx_standard})
endif(builtin_clang)

Expand All @@ -417,7 +429,11 @@ if (builtin_clang)
${CMAKE_CURRENT_SOURCE_DIR}/llvm-project/clang/include
${CLANG_BINARY_DIR}/include
CACHE STRING "Clang include directories.")
set(CLANG_CMAKE_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/")
if(builtin_llvm)
set(CLANG_CMAKE_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/")
else()
set(CLANG_CMAKE_DIR "${CMAKE_BINARY_DIR}/lib/cmake/clang/")
endif()
else()
find_package(Clang REQUIRED CONFIG)
message(STATUS "Found Clang ${CLANG_PACKAGE_VERSION} in ${CLANG_CMAKE_DIR}")
Expand Down
Loading