From c8f6d90e18eb6d6757697f554ca4ad84cfa4d647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= <leo@yuriev.ru>
Date: Mon, 27 Jan 2025 20:32:02 +0300
Subject: [PATCH] =?UTF-8?q?mdbx-cmake:=20=D1=80=D0=B0=D1=81=D1=88=D0=B8?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=20`LLVMgold.so`=20=D0=B2=20=D0=BE=D1=82=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20lib-?=
 =?UTF-8?q?=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D1=8F?=
 =?UTF-8?q?=D1=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake/compiler.cmake | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index 5fefdbae..d9197e66 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -541,13 +541,21 @@ if(CMAKE_COMPILER_IS_CLANG)
       if(regexp_valid)
         string(REGEX REPLACE "(^|\n.*)(.*programs: =)([^\n]+)((\n.*)|$)" "\\3" list ${clang_search_dirs})
         string(REPLACE ":" ";" list "${list}")
+        set(libs_extra_subdirs "lib;../lib;lib64;../lib64;lib32;../lib32")
         foreach(dir IN LISTS list)
           get_filename_component(dir "${dir}" REALPATH)
           if(dir MATCHES ".*llvm.*" OR dir MATCHES ".*clang.*")
-            list(APPEND clang_bindirs "${dir}")
+            set(list_suffix "")
           else()
-            list(APPEND clang_bindirs_x "${dir}")
+            set(list_suffix "_x")
           endif()
+          list(APPEND clang_bindirs${list_suffix} "${dir}")
+          foreach(subdir IN LISTS libs_extra_subdirs)
+            get_filename_component(subdir "${dir}/${subdir}" REALPATH)
+            if(EXISTS "${subdir}")
+              list(APPEND clang_libdirs${list_suffix} "${subdir}")
+            endif()
+          endforeach()
         endforeach()
         list(APPEND clang_bindirs "${clang_bindirs_x}")
         list(REMOVE_DUPLICATES clang_bindirs)
@@ -559,10 +567,11 @@ if(CMAKE_COMPILER_IS_CLANG)
         foreach(dir IN LISTS list)
           get_filename_component(dir "${dir}" REALPATH)
           if(dir MATCHES ".*llvm.*" OR dir MATCHES ".*clang.*")
-            list(APPEND clang_libdirs "${dir}")
+            set(list_suffix "")
           else()
-            list(APPEND clang_libdirs_x "${dir}")
+            set(list_suffix "_x")
           endif()
+          list(APPEND clang_libdirs${list_suffix} "${dir}")
         endforeach()
         list(APPEND clang_libdirs "${clang_libdirs_x}")
         list(REMOVE_DUPLICATES clang_libdirs)