[clang] [cmake] Reenable libclang.dll on Windows when LLVM_ENABLE_PIC (PR #138343)
Arthur Eubanks via cfe-commits
cfe-commits at lists.llvm.org
Fri May 2 14:00:07 PDT 2025
https://github.com/aeubanks updated https://github.com/llvm/llvm-project/pull/138343
>From f3e9e6f256bef046b513701a43b369c5c127aac7 Mon Sep 17 00:00:00 2001
From: Arthur Eubanks <aeubanks at google.com>
Date: Fri, 2 May 2025 20:39:17 +0000
Subject: [PATCH 1/2] [cmake] Reenable libclang.dll on Windows when
LLVM_ENABLE_PIC
This was accidentally disabled in #138119 for non-mingw Windows.
---
clang/tools/libclang/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
index 37a939ffcada7..8fbee71e02882 100644
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -106,7 +106,7 @@ if (LLVM_EXPORTED_SYMBOL_FILE)
DEPENDS ${LIBCLANG_VERSION_SCRIPT_FILE})
endif()
-if((NOT (WIN32 OR CYGWIN) AND LLVM_ENABLE_PIC) OR
+if((NOT CYGWIN AND LLVM_ENABLE_PIC) OR
((WIN32 OR CYGWIN) AND NOT LIBCLANG_BUILD_STATIC))
set(ENABLE_SHARED SHARED)
endif()
>From ec4b3b22f362a09e558323e9804a9b1e31feaca6 Mon Sep 17 00:00:00 2001
From: Arthur Eubanks <aeubanks at google.com>
Date: Fri, 2 May 2025 20:59:46 +0000
Subject: [PATCH 2/2] address comments
---
clang/tools/libclang/CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
index 8fbee71e02882..ac7a9a8db37c0 100644
--- a/clang/tools/libclang/CMakeLists.txt
+++ b/clang/tools/libclang/CMakeLists.txt
@@ -106,8 +106,7 @@ if (LLVM_EXPORTED_SYMBOL_FILE)
DEPENDS ${LIBCLANG_VERSION_SCRIPT_FILE})
endif()
-if((NOT CYGWIN AND LLVM_ENABLE_PIC) OR
- ((WIN32 OR CYGWIN) AND NOT LIBCLANG_BUILD_STATIC))
+if(LLVM_ENABLE_PIC OR ((WIN32 OR CYGWIN) AND NOT LIBCLANG_BUILD_STATIC))
set(ENABLE_SHARED SHARED)
endif()
More information about the cfe-commits
mailing list