Skip to content

Commit 0e4ba5a

Browse files
committed
[llvm-project] Replace downstream patch with backport
llvm/llvm-project#121293 properly fixes the mlgo-utils build issue found during the upgrade to LLVM 18.
1 parent de95c5e commit 0e4ba5a

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ROOT-llvm18-20250110-01
1+
ROOT-llvm18-20250113-01

interpreter/llvm-project/llvm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ if( LLVM_INCLUDE_UTILS )
11971197
add_subdirectory(utils/UnicodeData)
11981198
add_subdirectory(utils/yaml-bench)
11991199
add_subdirectory(utils/split-file)
1200-
# add_subdirectory(utils/mlgo-utils)
1200+
add_subdirectory(utils/mlgo-utils)
12011201
if( LLVM_INCLUDE_TESTS )
12021202
add_subdirectory(${LLVM_THIRD_PARTY_DIR}/unittest ${CMAKE_CURRENT_BINARY_DIR}/third-party/unittest)
12031203
endif()
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
configure_lit_site_cfg(
2-
"${CMAKE_CURRENT_SOURCE_DIR}/tests/lit.site.cfg.in"
3-
"${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg"
4-
)
1+
if(LLVM_INCLUDE_TESTS)
2+
configure_lit_site_cfg(
3+
"${CMAKE_CURRENT_SOURCE_DIR}/tests/lit.site.cfg.in"
4+
"${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg"
5+
)
56

6-
add_lit_testsuite(check-mlgo-utils "Running mlgo-utils tests"
7-
${CMAKE_CURRENT_BINARY_DIR}
8-
DEPENDS "FileCheck" "not" "count" "split-file" "yaml2obj" "llvm-objcopy"
9-
)
7+
add_lit_testsuite(check-mlgo-utils "Running mlgo-utils tests"
8+
${CMAKE_CURRENT_BINARY_DIR}
9+
DEPENDS "FileCheck" "not" "count" "split-file" "yaml2obj" "llvm-objcopy"
10+
)
1011

11-
set_target_properties(check-mlgo-utils PROPERTIES FOLDER "Tests")
12+
set_target_properties(check-mlgo-utils PROPERTIES FOLDER "Tests")
13+
endif()

0 commit comments

Comments
 (0)