diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py index 6f7cf8992b..a45bd72ba2 100644 --- a/programming/build/llvm/actions.py +++ b/programming/build/llvm/actions.py @@ -84,13 +84,13 @@ def setup(): def build(): shelltools.cd("build") - #shelltools.system("ninja") - cmaketools.make() + shelltools.system("ninja") + #cmaketools.make() def install(): shelltools.cd("build") - #shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) - cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) + #cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) if get.buildTYPE() == "emul32": pisitools.domove("/emul32/lib32/", "/usr/") diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml index acf2ec0782..aaba99a5ae 100755 --- a/programming/build/llvm/pspec.xml +++ b/programming/build/llvm/pspec.xml @@ -51,7 +51,7 @@ zlib libgcc ncurses - libcxx + llvm-polly /usr/bin @@ -81,7 +81,7 @@ libgcc ncurses libxml2 - libcxx + llvm-polly /usr/lib/libLLVM*.so @@ -104,8 +104,8 @@ libedit libxml2 ncurses - python3 - libcxx + python3 + llvm-polly /usr/bin/argdumper @@ -138,7 +138,7 @@ llvm-libs libgcc - libcxx + llvm-polly /usr/bin/ld.lld @@ -168,7 +168,6 @@ lld libgcc - libcxx /usr/include/lld/* @@ -214,7 +213,7 @@ llvm-libs libxml2 libgcc - libcxx + llvm-polly /usr/bin/diagtool @@ -255,7 +254,7 @@ llvm-libs libgcc ncurses - libcxx + llvm-polly /usr/bin/mlir* @@ -271,7 +270,6 @@ High-level loop and data-locality optimizer and optimization infrastructure for LLVM libgcc - libcxx /usr/lib/LLVMPolly.so