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
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
|
From 811f0a575231496318b5e9c9a0ff0ed195b16dc0 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 7 Sep 2021 16:35:07 -0400
Subject: [PATCH] build: Allow building Cling using the Clang shared library.
The officially supported way to build LLVM/Clang as a shared library
is via the LLVM_BUILD_LLVM_DYLIB and LLVM_LINK_LLVM_DYLIB CMake
options (see: https://llvm.org/docs/BuildingADistribution.html). When
built this way, the whole of Clang API is exposed as a shared
library (libclang-cpp.so).
* CMakeLists.txt: Query if we're in shared mode via llvm-config, and
register the result as LLVM_LIB_IS_SHARED.
[LLVM_LIB_IS_SHARED] <target_link_libraries>: Use the PUBLIC interface of the
LLVM shared library.
* lib/Interpreter/CMakeLists.txt [LLVM_LIB_IS_SHARED]: When defined, replace the
individual Clang components by clang-cpp.
* lib/MetaProcessor/CMakeLists.txt: Likewise.
* lib/Utils/CMakeLists.txt: Likewise.
* tools/Jupyter/CMakeLists.txt: Likewise.
* tools/driver/CMakeLists.txt: Likewise.
* tools/libcling/CMakeLists.txt: Likewise.
---
CMakeLists.txt | 10 ++++++--
lib/Interpreter/CMakeLists.txt | 40 ++++++++++++++++++--------------
lib/MetaProcessor/CMakeLists.txt | 16 +++++++++----
lib/Utils/CMakeLists.txt | 34 +++++++++++++++------------
tools/Jupyter/CMakeLists.txt | 11 ++++++++-
tools/driver/CMakeLists.txt | 16 +++----------
tools/libcling/CMakeLists.txt | 38 +++++++++++++++---------------
7 files changed, 93 insertions(+), 72 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65b14b27..888f7ee9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
"--libdir"
"--includedir"
"--prefix"
+ "--shared-mode"
"--src-root")
execute_process(
COMMAND ${CONFIG_COMMAND}
@@ -47,7 +48,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
list(GET CONFIG_OUTPUT 2 LIBRARY_DIR)
list(GET CONFIG_OUTPUT 3 INCLUDE_DIR)
list(GET CONFIG_OUTPUT 4 LLVM_OBJ_ROOT)
- list(GET CONFIG_OUTPUT 5 MAIN_SRC_DIR)
+ list(GET CONFIG_OUTPUT 5 LLVM_LIB_IS_SHARED)
+ list(GET CONFIG_OUTPUT 6 MAIN_SRC_DIR)
if(NOT MSVC_IDE)
set(LLVM_ENABLE_ASSERTIONS ${ENABLE_ASSERTIONS}
@@ -427,7 +429,11 @@ macro(add_cling_library name)
endif()
if(TARGET ${name})
- target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS})
+ if(LLVM_LIB_IS_SHARED)
+ target_link_libraries(${name} PUBLIC LLVM)
+ else()
+ target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS})
+ endif()
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "libcling")
install(TARGETS ${name}
diff --git a/lib/Interpreter/CMakeLists.txt b/lib/Interpreter/CMakeLists.txt
index 921c773c..af65c020 100644
--- a/lib/Interpreter/CMakeLists.txt
+++ b/lib/Interpreter/CMakeLists.txt
@@ -6,22 +6,28 @@
# LICENSE.TXT for details.
#------------------------------------------------------------------------------
-set(LIBS
- clingUtils
- clangCodeGen
- clangDriver
- clangFrontend
- clangParse
- clangSema
- clangAnalysis
- clangEdit
- clangRewrite
- clangRewriteFrontend
- clangSerialization
- clangAST
- clangBasic
- clangLex
-)
+if (LLVM_LIB_IS_SHARED)
+ set(LIBS
+ clang-cpp
+ clingUtils)
+else()
+ set(LIBS
+ clingUtils
+ clangCodeGen
+ clangDriver
+ clangFrontend
+ clangParse
+ clangSema
+ clangAnalysis
+ clangEdit
+ clangRewrite
+ clangRewriteFrontend
+ clangSerialization
+ clangAST
+ clangBasic
+ clangLex
+ )
+endif()
set(LLVM_LINK_COMPONENTS
analysis
@@ -369,4 +375,4 @@ if ((NOT builtin_llvm) AND builtin_clang)
get_property(P SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES)
list(INSERT P 0 ${FixInclude})
set_property(SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES "${P}")
-endif()
\ No newline at end of file
+endif()
diff --git a/lib/MetaProcessor/CMakeLists.txt b/lib/MetaProcessor/CMakeLists.txt
index e753dca3..5f4641bb 100644
--- a/lib/MetaProcessor/CMakeLists.txt
+++ b/lib/MetaProcessor/CMakeLists.txt
@@ -10,7 +10,16 @@ set( LLVM_LINK_COMPONENTS
core
support
binaryformat
-)
+ )
+
+if (LLVM_LIB_IS_SHARED)
+ set(LIBS clang-cpp)
+else()
+ set(LIBS
+ clangLex
+ clangAST
+ clangBasic)
+endif()
add_cling_library(clingMetaProcessor OBJECT
Display.cpp
@@ -21,10 +30,7 @@ add_cling_library(clingMetaProcessor OBJECT
MetaSema.cpp
LINK_LIBS
- clangLex
- clangAST
- clangBasic
-
+ ${LIBS}
clingInterpreter
clingUtils
)
diff --git a/lib/Utils/CMakeLists.txt b/lib/Utils/CMakeLists.txt
index 327c9fff..fbe4bd87 100644
--- a/lib/Utils/CMakeLists.txt
+++ b/lib/Utils/CMakeLists.txt
@@ -26,21 +26,25 @@ set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD}
)
-set(LIBS
- clangCodeGen
- clangDriver
- clangFrontend
- clangParse
- clangSema
- clangAnalysis
- clangEdit
- clangRewrite
- clangRewriteFrontend
- clangSerialization
- clangAST
- clangBasic
- clangLex
-)
+if (LLVM_LIB_IS_SHARED)
+ set(LIBS clang-cpp)
+else()
+ set(LIBS
+ clangCodeGen
+ clangDriver
+ clangFrontend
+ clangParse
+ clangSema
+ clangAnalysis
+ clangEdit
+ clangRewrite
+ clangRewriteFrontend
+ clangSerialization
+ clangAST
+ clangBasic
+ clangLex
+ )
+endif()
find_library(DL_LIBRARY_PATH dl)
if (DL_LIBRARY_PATH)
diff --git a/tools/Jupyter/CMakeLists.txt b/tools/Jupyter/CMakeLists.txt
index aad5f3f7..8b4ac36f 100644
--- a/tools/Jupyter/CMakeLists.txt
+++ b/tools/Jupyter/CMakeLists.txt
@@ -39,6 +39,14 @@ else()
endif()
endif()
+if (LLVM_LIB_IS_SHARED)
+ set(LIBS
+ clang-cpp
+ clingUserInterface
+ clingMetaProcessor
+ ${INTERPRETER}
+ clingUtils)
+else()
set(LIBS
clangAST
clangBasic
@@ -54,7 +62,8 @@ set(LIBS
clingMetaProcessor
${INTERPRETER}
clingUtils
- )
+ )
+endif()
if( LLVM_ENABLE_PIC )
set(ENABLE_SHARED SHARED)
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 1968b97f..5ed53fb7 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -9,23 +9,13 @@
# Keep symbols for JIT resolution
set(LLVM_NO_DEAD_STRIP 1)
-if(BUILD_SHARED_LIBS)
- set(LIBS
- LLVMSupport
-
- clangFrontendTool
-
- clingInterpreter
- clingMetaProcessor
- clingUserInterface
- clingUtils
- )
+if(LLVM_LIB_IS_SHARED)
+ set(LIBS clang-cpp clingUserInterface)
add_cling_executable(cling
cling.cpp
)
else()
set(LIBS
- LLVMSupport
clangASTMatchers
clangFrontendTool
@@ -38,7 +28,7 @@ else()
$<TARGET_OBJECTS:obj.clingMetaProcessor>
$<TARGET_OBJECTS:obj.clingUtils>
)
-endif(BUILD_SHARED_LIBS)
+endif(LLVM_LIB_IS_SHARED)
set_target_properties(cling
PROPERTIES ENABLE_EXPORTS 1)
diff --git a/tools/libcling/CMakeLists.txt b/tools/libcling/CMakeLists.txt
index 143d3bdb..ba000d44 100644
--- a/tools/libcling/CMakeLists.txt
+++ b/tools/libcling/CMakeLists.txt
@@ -10,21 +10,25 @@ set(SOURCES
ADDITIONAL_HEADERS
)
-set(LIBS
- clangAnalysis
- clangDriver
- clangFrontend
- clangParse
- clangSema
- clangAST
- clangLex
- clangSerialization
- clangCodeGen
- clangBasic
- clangEdit
-
- clingUtils
-)
+if (LLVM_LIB_IS_SHARED)
+ set(LIBS clang-cpp)
+else()
+ set(LIBS
+ clangAnalysis
+ clangDriver
+ clangFrontend
+ clangParse
+ clangSema
+ clangAST
+ clangLex
+ clangSerialization
+ clangCodeGen
+ clangBasic
+ clangEdit
+
+ clingUtils
+ )
+endif()
set( LLVM_LINK_COMPONENTS
analysis
@@ -63,10 +67,6 @@ option(LIBCLING_BUILD_STATIC
# set(LLVM_EXPORTED_SYMBOL_FILE)
#endif()
-if( LLVM_ENABLE_PIC )
- set(ENABLE_SHARED SHARED)
-endif()
-
if((NOT LLVM_ENABLE_PIC OR LIBCLING_BUILD_STATIC) AND NOT WIN32)
set(ENABLE_STATIC STATIC)
endif()
--
2.33.0
|