From 0656f30e3739d2d371d58f2fad66d634a766e0fe Mon Sep 17 00:00:00 2001 From: Konrad Kleine Date: Mon, 6 May 2024 22:50:03 +0000 Subject: [PATCH] Always build shared libs for LLD We don't want to enable BUILD_SHARED_LIBS for the whole build, but we do want to build lld libraries. --- 0001-Always-build-shared-libs-for-LLD.patch | 29 +++++++++++++++++++++ patches.spec.inc | 1 + 2 files changed, 30 insertions(+) create mode 100644 0001-Always-build-shared-libs-for-LLD.patch diff --git a/0001-Always-build-shared-libs-for-LLD.patch b/0001-Always-build-shared-libs-for-LLD.patch new file mode 100644 index 0000000..1659800 --- /dev/null +++ b/0001-Always-build-shared-libs-for-LLD.patch @@ -0,0 +1,29 @@ +From b1c60d7fa322a2d208556087df9e7ef94bfbffb8 Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Wed, 8 May 2024 12:30:36 +0900 +Subject: [PATCH] Always build shared libs for LLD + +We don't want to enable BUILD_SHARED_LIBS for the whole build, +but we do want to build lld libraries. +--- + lld/cmake/modules/AddLLD.cmake | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake +index 2ee066b41535..270c03f096ac 100644 +--- a/lld/cmake/modules/AddLLD.cmake ++++ b/lld/cmake/modules/AddLLD.cmake +@@ -7,9 +7,8 @@ macro(add_lld_library name) + "" + "" + ${ARGN}) +- if(ARG_SHARED) +- set(ARG_ENABLE_SHARED SHARED) +- endif() ++ # Always build shared libs for LLD. ++ set(ARG_ENABLE_SHARED SHARED) + llvm_add_library(${name} ${ARG_ENABLE_SHARED} ${ARG_UNPARSED_ARGUMENTS}) + set_target_properties(${name} PROPERTIES FOLDER "lld libraries") + +-- +2.44.0 \ No newline at end of file diff --git a/patches.spec.inc b/patches.spec.inc index d9f8555..1f2793e 100644 --- a/patches.spec.inc +++ b/patches.spec.inc @@ -9,6 +9,7 @@ Patch2005: 0001-Workaround-a-bug-in-ORC-on-ppc64le.patch #region LLD patches Patch3001: 0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch +Patch3002: 0001-Always-build-shared-libs-for-LLD.patch #endregion # # Drop the following patch after debugedit adds support to DWARF-5: