From 314b5a0efda75dcd195f1631333078de67be13c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Thu, 9 Sep 2021 08:19:55 +0000 Subject: [PATCH] [llvm-shlib] Fix the i686 MSVC triple check for listing symbols to export in LLVM-C.dll https://reviews.llvm.org/D47381 / eb46c95c3e7aeba4d183ca614fe238067eddf97f changed the triples set up by GetHostTriple.cmake for i686 MSVC from i686-pc-win32 to i686-pc-windows-msvc without changing the corresponding condition in llvm-shlib. Since then, the 32 bit x86 build of LLVM-C.dll has contained no exported symbols at all. Differential Revision: https://reviews.llvm.org/D109493 --- llvm/tools/llvm-shlib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt index 76b9a25..db013a8 100644 --- a/llvm/tools/llvm-shlib/CMakeLists.txt +++ b/llvm/tools/llvm-shlib/CMakeLists.txt @@ -124,7 +124,7 @@ if(LLVM_BUILD_LLVM_C_DYLIB AND MSVC) list(REMOVE_DUPLICATES LIB_NAMES) # The python script needs to know whether symbols are prefixed with underscores or not. - if(LLVM_HOST_TRIPLE STREQUAL "i686-pc-win32") + if(LLVM_HOST_TRIPLE MATCHES "i?86-.*win.*") set(GEN_UNDERSCORE "--underscore") else() set(GEN_UNDERSCORE "") -- 2.7.4