diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index ee2dc70a2e..462b1e3f6f 100644
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -48,16 +48,16 @@ def setup():
     shelltools.cd("build")
     
     if get.buildTYPE() != "emul32":
-        pisitools.cflags.add("-m64")
-        pisitools.cxxflags.add("-m64")
+        pisitools.cflags.add("-m64 -rtlib=compiler-rt")
+        pisitools.cxxflags.add("-m64 -stdlib=libc++ -rtlib=compiler-rt")
         options = "-DLLVM_TARGET_ARCH:STRING=x86_64 \
                    -DLLDB_ENABLE_LUA=OFF \
                    -DLLVM_DEFAULT_TARGET_TRIPLE=%s " % get.HOST()
                           
     
     if get.buildTYPE() == "emul32":
-        pisitools.cflags.add("-m32")
-        pisitools.cxxflags.add("-m32")        
+        pisitools.cflags.add("-m32 -rtlib=compiler-rt")
+        pisitools.cxxflags.add("-m32 -stdlib=libc++ -rtlib=compiler-rt")        
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
         options = "  -DCMAKE_INSTALL_PREFIX=/emul32 \
                      -DLLVM_TARGET_ARCH:STRING=i686  \
@@ -79,6 +79,7 @@ def setup():
                           -DLLVM_ENABLE_ASSERTIONS=OFF \
                           -DFFI_INCLUDE_DIR=/usr/include \
                           -DLLVM_ENABLE_LIBCXX=ON \
+                          -DLLVM_VERSION_SUFFIX='libcxx' \
                           -DCOMPILER_RT_USE_LIBCXX=OFF" % (options, projects, libsuffix), sourceDir=".." ) 
 
 def build():
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index 17532674f0..c24ea4e442 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -29,6 +29,7 @@
             <Dependency>gcc</Dependency>
             <Dependency>llvm-clang</Dependency>
             <Dependency>lld</Dependency> 
+            <Dependency>libcxx-devel</Dependency> 
         </BuildDependencies>
         <!--<AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="../support-linking-ScopPassManager-against-LLVM-dylib.patch">support-linking-ScopPassManager-against-LLVM-dylib.patch</AdditionalFile>
@@ -49,6 +50,7 @@
             <Dependency>zlib</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>ncurses</Dependency>
+            <Dependency>libcxx</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -78,6 +80,7 @@
             <Dependency>libgcc</Dependency>
             <Dependency>ncurses</Dependency>
             <Dependency>libxml2</Dependency>
+            <Dependency>libcxx</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/libLLVM*.so</Path>
@@ -101,6 +104,7 @@
             <Dependency>libxml2</Dependency>
             <Dependency>ncurses</Dependency>
             <Dependency>python3</Dependency>
+            <Dependency>libcxx</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/argdumper</Path>
@@ -133,6 +137,7 @@
         <RuntimeDependencies>
             <Dependency release="current">llvm-libs</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency>libcxx</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/ld.lld</Path>
@@ -162,6 +167,7 @@
         <RuntimeDependencies>
             <Dependency release="current">lld</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency>libcxx</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/lld/*</Path>
@@ -207,6 +213,7 @@
             <Dependency release="current">llvm-libs</Dependency>
             <Dependency>libxml2</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency>libcxx</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/diagtool</Path>
@@ -247,6 +254,7 @@
             <Dependency release="current">llvm-libs</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>ncurses</Dependency>
+            <Dependency>libcxx</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/mlir*</Path>
@@ -262,6 +270,7 @@
         <Summary>High-level loop and data-locality optimizer and optimization infrastructure for LLVM</Summary>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
+            <Dependency>libcxx</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/LLVMPolly.so</Path>
@@ -292,6 +301,7 @@
             <Dependency>libffi-32bit</Dependency>
             <Dependency>libxml2-32bit</Dependency>
             <Dependency>ncurses-32bit</Dependency>
+            <Dependency>libcxx-32bit</Dependency> 
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency release="current">llvm</Dependency>
@@ -300,6 +310,7 @@
             <Dependency>ncurses-32bit</Dependency>
             <Dependency>zlib-32bit</Dependency>
             <Dependency>libffi-32bit</Dependency>
+            <Dependency>libcxx-32bit</Dependency> 
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/llvm-config-32</Path>