0001-Fix-standalone-build-for-llvm.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. From 255068deb7f3d18837ed30e739aa92c111ab450a Mon Sep 17 00:00:00 2001
  2. From: El Mehdi YOUNES <elmehdi.younes@smile.fr>
  3. Date: Sat, 10 May 2025 12:55:07 +0200
  4. Subject: [PATCH] Fix standalone build for llvm
  5. Upstream commit 9dd01a5241dc ("Harmonize cmake_policy() across standalone builds of all projects")
  6. moved the `cmake_policy()` settings from `llvm/CMakeLists.txt` into a shared
  7. `cmake/modules/CMakePolicy.cmake`, and included it from all relevant projects
  8. (Clang, LLD, LLDB, etc.) to harmonize standalone builds.
  9. However, in `llvm/CMakeLists.txt`, unlike other components, the line:
  10. set(LLVM_COMMON_CMAKE_UTILS ...)
  11. was left **without** the usual:
  12. if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
  13. This prevents external build systems (e.g., when using separate source archives)
  14. from overriding the `LLVM_COMMON_CMAKE_UTILS` variable, since the value is
  15. always reset unconditionally.
  16. This patch adds the missing `if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)` guard,
  17. in the same way as it is already done in Clang, LLD, etc., to make
  18. `LLVM_COMMON_CMAKE_UTILS` properly overridable.
  19. Upstream: Not submitted
  20. Signed-off-by: El Mehdi YOUNES <elmehdi.younes@smile.fr>
  21. ---
  22. llvm/CMakeLists.txt | 5 ++++-
  23. 1 file changed, 4 insertions(+), 1 deletion(-)
  24. diff --git a/CMakeLists.txt b/CMakeLists.txt
  25. index f5293e866324..d861233f299f 100644
  26. --- a/CMakeLists.txt
  27. +++ b/CMakeLists.txt
  28. @@ -4,7 +4,10 @@ cmake_minimum_required(VERSION 3.20.0)
  29. include(CMakeDependentOption)
  30. -set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
  31. +if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
  32. + set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
  33. +endif()
  34. +
  35. include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
  36. NO_POLICY_SCOPE)
  37. --
  38. 2.49.0