blob: c9f92d4d52d9de9b2ef8f44aa94630b4d9ec7e3c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
---
cmake/modules/AddLLVM.cmake | 2 -
polly/lib/CMakeLists.txt | 47 +++++++++++++++++---------------------------
2 files changed, 20 insertions(+), 29 deletions(-)
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -501,7 +501,7 @@ function(llvm_add_library name)
# On DLL platforms symbols are imported from the tool by linking against it.
set(llvm_libs ${ARG_PLUGIN_TOOL})
elseif (DEFINED LLVM_LINK_COMPONENTS OR DEFINED ARG_LINK_COMPONENTS)
- if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
+ if (NOT ARG_STATIC AND LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
set(llvm_libs LLVM)
else()
llvm_map_components_to_libnames(llvm_libs
--- a/polly/lib/CMakeLists.txt
+++ b/polly/lib/CMakeLists.txt
@@ -66,35 +66,26 @@ endif (GPU_CODEGEN)
target_link_libraries(Polly PollyISL jsoncpp)
-if (BUILD_SHARED_LIBS)
- target_link_libraries(Polly
- LLVMSupport
- LLVMCore
- LLVMScalarOpts
- LLVMInstCombine
- LLVMTransformUtils
- LLVMAnalysis
- LLVMipo
- LLVMMC
+target_link_libraries(Polly
+ LLVMSupport
+ LLVMCore
+ LLVMScalarOpts
+ LLVMInstCombine
+ LLVMTransformUtils
+ LLVMAnalysis
+ LLVMipo
+ LLVMMC
# The libraries below are required for darwin: http://PR26392
- LLVMBitReader
- LLVMMCParser
- LLVMObject
- LLVMProfileData
- LLVMTarget
- LLVMVectorize
- )
- link_directories(
- ${LLVM_LIBRARY_DIR}
- )
-elseif (LLVM_LINK_LLVM_DYLIB)
- target_link_libraries(Polly
- LLVM
- )
- link_directories(
- ${LLVM_LIBRARY_DIR}
- )
-endif()
+ LLVMBitReader
+ LLVMMCParser
+ LLVMObject
+ LLVMProfileData
+ LLVMTarget
+ LLVMVectorize
+)
+link_directories(
+ ${LLVM_LIBRARY_DIR}
+)
# Build a monolithic Polly.a and a thin module LLVMPolly.moduleext that links to
# that static library.
|
