[BOLT] Support building bolt when LLVM_LINK_LLVM_DYLIB is ON

This does *not* link with libLLVM, but with static archives instead. Not
super-great, but at least the build works, which is probably better than
failing.

Related to #57551

Differential Revision: https://reviews.llvm.org/D134434
This commit is contained in:
serge-sans-paille 2022-09-22 15:01:04 +02:00
parent 8b587113b7
commit 61cff9079c
15 changed files with 28 additions and 0 deletions

View File

@ -24,6 +24,7 @@ add_llvm_library(LLVMBOLTCore
ParallelUtilities.cpp
Relocation.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_LIBS
${LLVM_PTHREAD_LIB}
)

View File

@ -45,6 +45,8 @@ add_llvm_library(LLVMBOLTPasses
VeneerElimination.cpp
RetpolineInsertion.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_LIBS
${LLVM_PTHREAD_LIB}

View File

@ -7,6 +7,8 @@ add_llvm_library(LLVMBOLTProfile
YAMLProfileReader.cpp
YAMLProfileWriter.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_COMPONENTS
Support
)

View File

@ -33,6 +33,8 @@ add_llvm_library(LLVMBOLTRewrite
MachORewriteInstance.cpp
RewriteInstance.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_LIBS
${LLVM_PTHREAD_LIB}
)

View File

@ -10,6 +10,8 @@ add_llvm_library(LLVMBOLTRuntimeLibs
RuntimeLibrary.cpp
HugifyRuntimeLibrary.cpp
InstrumentationRuntimeLibrary.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
)
target_link_libraries(LLVMBOLTRuntimeLibs

View File

@ -7,6 +7,8 @@ set(LLVM_LINK_COMPONENTS
add_llvm_library(LLVMBOLTTargetAArch64
AArch64MCPlusBuilder.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
DEPENDS
AArch64CommonTableGen
)

View File

@ -9,6 +9,8 @@ add_llvm_library(LLVMBOLTTargetX86
X86MCPlusBuilder.cpp
X86MCSymbolizer.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
DEPENDS
X86CommonTableGen
)

View File

@ -2,6 +2,8 @@ add_llvm_library(LLVMBOLTUtils
CommandLineOpts.cpp
Utils.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_LIBS
${LLVM_PTHREAD_LIB}

View File

@ -5,6 +5,8 @@ set(LLVM_LINK_COMPONENTS
add_llvm_tool(llvm-bat-dump
bat-dump.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
)
target_link_libraries(llvm-bat-dump

View File

@ -14,6 +14,8 @@ endif()
add_bolt_tool(llvm-bolt
llvm-bolt.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
DEPENDS
${BOLT_DRIVER_DEPS}
)

View File

@ -7,6 +7,7 @@ set(LLVM_LINK_COMPONENTS
add_bolt_tool(llvm-bolt-heatmap
heatmap.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
)
target_link_libraries(llvm-bolt-heatmap

View File

@ -4,6 +4,8 @@ set(LLVM_LINK_COMPONENTS
add_llvm_fuzzer(llvm-bolt-fuzzer
llvm-bolt-fuzzer.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
)
if (TARGET llvm-bolt-fuzzer)

View File

@ -3,6 +3,8 @@ set(LLVM_LINK_COMPONENTS Support)
add_bolt_tool(merge-fdata
merge-fdata.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
DEPENDS
intrinsics_gen
)

View File

@ -9,6 +9,8 @@ add_bolt_unittest(CoreTests
BinaryContext.cpp
MCPlusBuilder.cpp
DynoStats.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
)
target_link_libraries(CoreTests

View File

@ -1,5 +1,7 @@
add_bolt_unittest(ProfileTests
DataAggregator.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
)
target_link_libraries(ProfileTests