1 |
commit: 6f5f03d793825d23190f9530d7d0359199f2cc30 |
2 |
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Sep 29 09:46:10 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 29 23:52:33 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5f03d7 |
7 |
|
8 |
dev-lang/ispc: Update live ebuild llvm patch |
9 |
|
10 |
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com> |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
dev-lang/ispc/files/ispc-9999-llvm.patch | 11 +++++++---- |
14 |
1 file changed, 7 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/dev-lang/ispc/files/ispc-9999-llvm.patch b/dev-lang/ispc/files/ispc-9999-llvm.patch |
17 |
index 7303ac0fd6e8..934d9eaf5a60 100644 |
18 |
--- a/dev-lang/ispc/files/ispc-9999-llvm.patch |
19 |
+++ b/dev-lang/ispc/files/ispc-9999-llvm.patch |
20 |
@@ -2,15 +2,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt |
21 |
index 13e66268..27ff8364 100644 |
22 |
--- a/CMakeLists.txt |
23 |
+++ b/CMakeLists.txt |
24 |
-@@ -218,7 +218,7 @@ if (WASM_ENABLED) |
25 |
+@@ -218,10 +218,7 @@ if (WASM_ENABLED) |
26 |
list(APPEND ISPC_TARGETS wasm-i32x4) |
27 |
endif() |
28 |
|
29 |
-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex) |
30 |
+set(CLANG_LIBRARY_LIST clang clang-cpp) |
31 |
+-if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0") |
32 |
+- list(APPEND CLANG_LIBRARY_LIST clangSupport) |
33 |
+-endif() |
34 |
set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp) |
35 |
- |
36 |
- if (X86_ENABLED) |
37 |
+ if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0") |
38 |
+ # windowsdriver is a small library introduced in LLVM 15. While it's targeted at Windows only, |
39 |
@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN) |
40 |
endif() |
41 |
|
42 |
@@ -24,7 +27,7 @@ index 13e66268..27ff8364 100644 |
43 |
+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST}) |
44 |
|
45 |
# Link against LLVM libraries |
46 |
- target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST}) |
47 |
+ target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST} ${CMAKE_DL_LIBS}) |
48 |
diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp |
49 |
index 06fab989..57a7130f 100644 |
50 |
--- a/src/llvmutil.cpp |