Fix toolchain one more time

2 files changed, 17 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 18760cf282ba..5ed9768fbb5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,14 +14,13 @@ makedepends=(
     'clang14'
     'cmake'
     'conan1'
-    'dacite'
     'libidn'
-    'lld14'
-    'lldb14'
+    'lld'
     'llvm14'
     'llvm14-libs'
     'ninja'
     'python'
+    'python-dacite'
     'python-pip'
 )
 _commit=5b46de977a4d9298ab38ff332ae2bbb90d4d615b
diff --git a/clang.toolchain.diff b/clang.toolchain.diff
index 9003d450aae3..914b622209c7 100644
--- a/clang.toolchain.diff
+++ b/clang.toolchain.diff
@@ -1,8 +1,18 @@
---- a/clang.toolchain     2023-07-27 03:49:50.396073711 +0300
-+++ b/clang.toolchain     2023-07-27 03:50:13.904064888 +0300
-@@ -7,7 +7,7 @@
- set(ENV{CC} clang-14)
- set(ENV{CXX} clang++-14)
+--- clang.toolchain.orig	2023-07-28 15:55:33.000000000 +0300
++++ clang.toolchain	2023-07-31 03:33:43.218644908 +0300
+@@ -1,13 +1,13 @@
+-set(CMAKE_C_COMPILER clang-14)
+-set(CMAKE_CXX_COMPILER clang++-14)
++set(CMAKE_C_COMPILER /usr/lib/llvm14/bin/clang)
++set(CMAKE_CXX_COMPILER /usr/lib/llvm14/bin/clang++)
+ 
+ set(CMAKE_C_STANDARD_LIBRARIES "-lc -lm")
+ set(CMAKE_CXX_STANDARD_LIBRARIES "-lc -lm")
+ 
+-set(ENV{CC} clang-14)
+-set(ENV{CXX} clang++-14)
++set(ENV{CC} /usr/lib/llvm14/bin/clang)
++set(ENV{CXX} /usr/lib/llvm14/bin/clang++)
  
 -set(CMAKE_EXE_LINKER_FLAGS -fuse-ld=lld-14)
 -set(CMAKE_SHARED_LINKER_FLAGS -fuse-ld=lld-14)
@@ -10,4 +20,3 @@
 +set(CMAKE_SHARED_LINKER_FLAGS -fuse-ld=lld)
  
  set(CMAKE_POSITION_INDEPENDENT_CODE On)
-