1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374 |
- From 98fadafeae0204defedd89f015f7fb88f2888b2f Mon Sep 17 00:00:00 2001
- From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
- Date: Fri, 17 Mar 2023 14:27:10 -0300
- Subject: [PATCH] Fix standalone builds with LLVM_LINK_LLVM_DYLIB=ON
- Move the LLVM components to LINK_COMPONENTS because the DEPENDS list has
- the same semantics as add_dependencies(). In this
- case it doesn't include the LLVM components when calling the linker.
- ---
- lib/SPIRV/CMakeLists.txt | 47 ++++++++++++----------------------------
- 1 file changed, 14 insertions(+), 33 deletions(-)
- diff --git a/lib/SPIRV/CMakeLists.txt b/lib/SPIRV/CMakeLists.txt
- index bbef00528..2810c6b2c 100644
- --- a/lib/SPIRV/CMakeLists.txt
- +++ b/lib/SPIRV/CMakeLists.txt
- @@ -38,42 +38,23 @@ set(SRC_LIST
- libSPIRV/SPIRVType.cpp
- libSPIRV/SPIRVValue.cpp
- )
- -if(LLVM_LINK_LLVM_DYLIB)
- - add_llvm_library(LLVMSPIRVLib STATIC DISABLE_LLVM_LINK_LLVM_DYLIB
- - ${SRC_LIST}
- - DEPENDS
- - intrinsics_gen
- - LLVMAnalysis
- - LLVMBitWriter
- - LLVMCodeGen
- - LLVMCore
- - LLVMDemangle
- - LLVMIRReader
- - LLVMLinker
- - LLVMPasses
- - LLVMSupport
- - LLVMTargetParser
- - LLVMTransformUtils
- - )
- -else()
- - add_llvm_library(LLVMSPIRVLib
- - ${SRC_LIST}
- - LINK_COMPONENTS
- - Analysis
- - BitWriter
- - CodeGen
- - Core
- - Demangle
- - IRReader
- - Linker
- - Passes
- - Support
- - TargetParser
- - TransformUtils
- +add_llvm_library(LLVMSPIRVLib
- + ${SRC_LIST}
- + LINK_COMPONENTS
- + Analysis
- + BitWriter
- + CodeGen
- + Core
- + Demangle
- + IRReader
- + Linker
- + Passes
- + Support
- + TargetParser
- + TransformUtils
- DEPENDS
- intrinsics_gen
- )
- -endif()
-
- target_include_directories(LLVMSPIRVLib
- PRIVATE
|