Skip to content

Commit 11efb3d

Browse files
committed
[legacy] root: Disable runtime_cxxmodules alltogether
This feature is frequently broken on various platforms.
1 parent 5cb1f4e commit 11efb3d

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

cmake/legacy.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,6 @@ else()
370370
unset(root_cocoa)
371371
set(root_x11 ON)
372372
endif()
373-
if(CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION GREATER 11)
374-
set(root_runtime_cxxmodules "-Druntime_cxxmodules=OFF")
375-
endif()
376373
ExternalProject_Add(root
377374
GIT_REPOSITORY https://github.com/root-project/root/ GIT_TAG v${root_version_gittag}
378375
GIT_SHALLOW 1
@@ -395,6 +392,7 @@ ExternalProject_Add(root
395392
"-Dpythia6=ON"
396393
"-Dreflex=OFF"
397394
"-Droofit=ON"
395+
"-Druntime_cxxmodules=OFF"
398396
"-Drpath=ON"
399397
"-Dsoversion=ON"
400398
"-Dspectrum=ON"
@@ -409,7 +407,6 @@ ExternalProject_Add(root
409407
${cmake_python_config_old}
410408
${root_builtin_glew}
411409
${root_cocoa}
412-
${root_runtime_cxxmodules}
413410
PATCH_COMMAND ${patch} -p1 -i "${CMAKE_SOURCE_DIR}/legacy/root/fix_macos_sdk_mismatch.patch"
414411
DEPENDS pythia6 pythia8 vc ${extract_source_cache_target}
415412
${LOG_TO_FILE}

0 commit comments

Comments
 (0)