diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index d7cc416570..beef65fd41 100755
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -11,10 +11,12 @@ from pisi.actionsapi import cmaketools
libdir = "/usr/lib32/llvm" if get.buildTYPE() == "emul32" else "/usr/lib/llvm"
lib = "lib32" if get.buildTYPE() == "emul32" else "lib"
-
+libsuffix = "32" if get.buildTYPE() == "emul32" else ""
def setup():
+ #pisitools.ldflags.add("-fuse-ld=lld")
+
if get.buildTYPE() != "emul32":
if not shelltools.can_access_directory("tools/clang"):
shelltools.system("tar xf ../clang-%s.src.tar.xz -C tools" % get.srcVERSION())
@@ -34,7 +36,7 @@ def setup():
if not shelltools.can_access_directory("projects/compiler-rt"):
shelltools.system("tar xf ../compiler-rt-%s.src.tar.xz -C projects" % get.srcVERSION())
- shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt")
+ shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt")
shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++")
@@ -79,7 +81,10 @@ def setup():
-DLLVM_INCLUDEDIR=/usr/include \
-DLLVM_ENABLE_ASSERTIONS=OFF \
-DFFI_INCLUDE_DIR=/usr/lib/libffi-3.2.1/include \
- -DENABLE_SHARED=ON" % options, sourceDir=".." )
+ -DCOMPILER_RT_USE_LIBCXX=OFF \
+ -DLIBOMP_USE_HIER_SCHED=ON \
+ -DCLANG_DEFAULT_UNWINDLIB=libunwind \
+ -DENABLE_SHARED=ON" % (options), sourceDir=".." )
def build():
shelltools.makedirs("build")
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index 1bd1e2ec13..aedfd82a24 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -11,13 +11,13 @@
NCSA
The Low Level Virtual Machine
The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. Despite its name, LLVM has little to do with traditional virtual machines, though it does provide helpful libraries that can be used to build them.
- https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/llvm-9.0.1.src.tar.xz
- https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/clang-9.0.1.src.tar.xz
- https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/clang-tools-extra-9.0.1.src.tar.xz
- https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/lldb-9.0.1.src.tar.xz
- https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/lld-9.0.1.src.tar.xz
- https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/polly-9.0.1.src.tar.xz
- https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/compiler-rt-9.0.1.src.tar.xz
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/llvm-10.0.0.src.tar.xz
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang-10.0.0.src.tar.xz
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang-tools-extra-10.0.0.src.tar.xz
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/lldb-10.0.0.src.tar.xz
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/lld-10.0.0.src.tar.xz
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/polly-10.0.0.src.tar.xz
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/compiler-rt-10.0.0.src.tar.xz
zlib-devel
libxml2-devel
@@ -31,7 +31,8 @@
cmake
binutils
- llvm-clang
+ llvm-clang
+
@@ -170,8 +171,6 @@
/usr/include/lld/*
-
-
llvm-clang-analyzer
@@ -205,7 +204,6 @@
/usr/bin/clang*
/usr/bin/c-index-test
/usr/bin/tblgen
- /usr/lib/clang
/usr/lib/libclang*
@@ -214,6 +212,16 @@
/usr/share/clang
+
+
+ compiler-rt
+ Various runtime libraries used by Clang
+
+
+
+ /usr/lib/clang/10.0.0/lib/linux/*.so
+
+
llvm-clang-devel
@@ -265,8 +273,8 @@
- 2020-01-04
- 9.0.1
+ 2020-03-24
+ 10.0.0
Version bump.
Idris Kalp
idriskalp@gmail.com