From 053581d26313b1a3da51145575129a34146c6622 Mon Sep 17 00:00:00 2001 From: Niram7777 Date: Sat, 21 Mar 2026 05:25:23 +0000 Subject: [PATCH 1/2] CI FreeBSD linker-devel --- .ci/build-freebsd.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index 7e10691203..243116a35d 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -16,6 +16,9 @@ CONFIGURE_ARGS=" -DUSE_SYSTEM_LIBPNG=ON -DUSE_SYSTEM_LIBUSB=ON -DUSE_SYSTEM_OPENCV=ON + -DCMAKE_LINKER_TYPE=lld-devel + -DCMAKE_C_USING_LINKER_lld-devel=-fuse-ld=lld-devel + -DCMAKE_CXX_USING_LINKER_lld-devel=-fuse-ld=lld-devel " # base Clang workaround (missing clang-scan-deps) From 639fbbb16aa1f63a4dcd90d32d546b0114d66ab0 Mon Sep 17 00:00:00 2001 From: Niram7777 Date: Sat, 21 Mar 2026 05:44:52 +0000 Subject: [PATCH 2/2] Ignore pre-installed 19 to select llvm-devel --- .ci/build-freebsd.sh | 1 + 3rdparty/llvm/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index 243116a35d..defd4a7d18 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -16,6 +16,7 @@ CONFIGURE_ARGS=" -DUSE_SYSTEM_LIBPNG=ON -DUSE_SYSTEM_LIBUSB=ON -DUSE_SYSTEM_OPENCV=ON + -DFIND_LLVM_VERSION=22.0...99.9 -DCMAKE_LINKER_TYPE=lld-devel -DCMAKE_C_USING_LINKER_lld-devel=-fuse-ld=lld-devel -DCMAKE_CXX_USING_LINKER_lld-devel=-fuse-ld=lld-devel diff --git a/3rdparty/llvm/CMakeLists.txt b/3rdparty/llvm/CMakeLists.txt index a4af3b3ef5..7fdbcab8e0 100644 --- a/3rdparty/llvm/CMakeLists.txt +++ b/3rdparty/llvm/CMakeLists.txt @@ -58,12 +58,14 @@ if(WITH_LLVM) else() message(STATUS "Using prebuilt or system LLVM") + set(FIND_LLVM_VERSION "19.1...99.9" CACHE STRING "LLVM version to search for.") + if (LLVM_DIR AND NOT IS_ABSOLUTE "${LLVM_DIR}") # change relative LLVM_DIR to be relative to the source dir set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR}) endif() - find_package(LLVM CONFIG) + find_package(LLVM ${FIND_LLVM_VERSION} CONFIG) if (NOT LLVM_FOUND) message(FATAL_ERROR "Can't find LLVM libraries from the CMAKE_PREFIX_PATH path or LLVM_DIR. Enable BUILD_LLVM option to build LLVM from included as a git submodule.")