1 files changed, 13 insertions, 6 deletions
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 81a18569f..4c7f869b6 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=llvm
 VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -153,6 +153,7 @@ cd build
     -DLLVM_BINUTILS_INCDIR=/usr/include \
     -DCLANG_RESOURCE_DIR="../lib${LIBDIRSUFFIX}/clang/${VERSION}" \
     -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \
+    -DLLDB_USE_SYSTEM_SIX=1 \
     $CLANGD \
     ..  || exit 1
 
@@ -166,25 +167,31 @@ cd ..
   ln -sf clang++ $ARCH-slackware-linux-clang++
 )
 
-# install clang-static-analyzer
+# Install clang-static-analyzer:
 for i in ccc c++; do
   ln -s /usr/libexec/$i-analyzer \
     $PKG/usr/bin/$i-analyzer || exit 1
 done
 
-# Remove symlink to libgomp, which is already provided by gcc
+# Ensure lit-cpuid is installed:
+if [ ! -r $PKG/usr/bin/lit-cpuid ]; then
+  cp -a build/bin/lit-cpuid $PKG/usr/bin/lit-cpuid
+  chown root:root $PKG/usr/bin/lit-cpuid
+  chmod 755 $PKG/usr/bin/lit-cpuid
+fi
+# Remove symlink to libgomp, which is already provided by gcc:
 rm -f $PKG/usr/lib$LIBDIRSUFFIX/libgomp.so
 
-# Install Python bindings
+# Install Python bindings:
 for pyver in ${PY2} ${PY3}; do
   mkdir -p "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages"
   cp -a tools/clang/bindings/python/clang "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages/"
 done
 
-# Remove bundled python-six
+# Remove bundled python-six:
 rm -f "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/six.py"
 
-# Compile Python scripts
+# Compile Python scripts:
 python -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/clang"
 python -O -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/clang"
 python3 -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY3}/site-packages/clang"