Skip to content

Commit 6ca69b6

Browse files
compnerdllvmbot
authored andcommitted
build: adjust LLDB and clang library naming on Windows (#185084)
Ensure that use of the GNU driver does not change the library name on Windows. We would check the build tools being MSVC rather than targeting Windows to select the output name. (cherry picked from commit 687e66c)
1 parent c0262e7 commit 6ca69b6

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎clang/tools/libclang/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ if (MSVC AND ENABLE_SHARED AND ENABLE_STATIC)
120120
unset(ENABLE_STATIC)
121121
endif()
122122

123-
if(MSVC)
123+
if(WIN32 AND NOT MINGW)
124124
set(output_name "libclang")
125125
else()
126126
set(output_name "clang")

‎lldb/source/API/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS)
265265
add_llvm_symbol_exports(liblldb ${exported_symbol_file})
266266
endif()
267267

268-
if (NOT MSVC)
268+
if(NOT WIN32 OR MINGW)
269269
set_target_properties(liblldb
270270
PROPERTIES
271271
OUTPUT_NAME lldb

0 commit comments

Comments
 (0)