From f796927119613512da532dae71c7232a8fcfddc3 Mon Sep 17 00:00:00 2001 From: Vincenzo Eduardo Padulano Date: Thu, 26 Feb 2026 10:45:02 +0100 Subject: [PATCH 1/2] [cling] Remove hardcoded CLING_OSX_SYSROOT This is an upstream of https://github.com/conda-forge/root-feedstock/blob/df86316b299d8214d3181d76c31925696f076d5e/recipe/patches/0011-root-x.xx.xx-osx-remove-hardcoded-sysroot.patch --- .../cling/lib/Interpreter/CMakeLists.txt | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/interpreter/cling/lib/Interpreter/CMakeLists.txt b/interpreter/cling/lib/Interpreter/CMakeLists.txt index 416a3b002ecd5..2786a0c88bdef 100644 --- a/interpreter/cling/lib/Interpreter/CMakeLists.txt +++ b/interpreter/cling/lib/Interpreter/CMakeLists.txt @@ -317,25 +317,6 @@ if (UNIX) #define CLING_CXX_INCL \"${CLING_CXX_HEADERS}\" #define CLING_INCLUDE_PATHS \"${CLING_INCLUDE_PATHS}\" ") - if (CMAKE_OSX_SYSROOT) - # CMAKE_OSX_SYSROOT hardcodes the concrete version of the sdk - # (eg .../MacOSX11.1.sdk) which changes after every update of XCode. We use - # the assumption that in the parent folder there is a symlink MacOSX.sdk - # which points to the current active sdk. This change allows releases - # to work when the users update their sdks. - # FIXME: That is a horrible hack and we should teach CIFactory to pick up - # the SDK directory at runtime, just as we do for the include paths to C++. - set (OSX_SYSROOT_DEFAULT_SDK ${CMAKE_OSX_SYSROOT}) - if (${OSX_SYSROOT_DEFAULT_SDK} MATCHES "MacOSX[.0-9]+\.sdk") - get_filename_component(OSX_SYSROOT_DEFAULT_SDK ${OSX_SYSROOT_DEFAULT_SDK} DIRECTORY) - set (OSX_SYSROOT_DEFAULT_SDK ${OSX_SYSROOT_DEFAULT_SDK}/MacOSX.sdk/) - endif() - - file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h.in - " - #define CLING_OSX_SYSROOT \"${OSX_SYSROOT_DEFAULT_SDK}\" - ") - endif() if (CLING_CXX_PATH) MESSAGE(STATUS "And if not found, will invoke: '${CLING_CXX_PATH}' for them.") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h.in From 1c41dbe146f8fb599204f7f8e83882c86876797f Mon Sep 17 00:00:00 2001 From: Vincenzo Eduardo Padulano Date: Fri, 27 Feb 2026 19:16:52 +0100 Subject: [PATCH 2/2] [ntuple] Align SDKROOT used by genreflex in test with CMake one As is done for rootcling --- tree/ntuple/test/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tree/ntuple/test/CMakeLists.txt b/tree/ntuple/test/CMakeLists.txt index 17278482d9cf2..0c177a9adcfd2 100644 --- a/tree/ntuple/test/CMakeLists.txt +++ b/tree/ntuple/test/CMakeLists.txt @@ -109,6 +109,9 @@ ROOT_GENERATE_DICTIONARY(StreamerFieldDict ${CMAKE_CURRENT_SOURCE_DIR}/StreamerF if(MSVC) set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" $) +elseif(APPLE) + set(command ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}" + "ROOTIGNOREPREFIX=1" SDKROOT=${CMAKE_OSX_SYSROOT} $) else() set(command ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}" "ROOTIGNOREPREFIX=1" $)