diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index cd02375e7d..b5be0000ec 100644
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -23,19 +23,19 @@ NoStrip = ["/usr/lib/clang/%s/lib/linux" % get.srcVERSION()]
 WorkDir = "llvm-project-%s.src/llvm" % get.srcVERSION()
 
 def setup():
-    #pisitools.ldflags.add("-fuse-ld=lld")
-    #pisitools.cflags.remove("-D_FORTIFY_SOURCE=2")
-    #pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2")
-    #shelltools.export("CC", "clang")
-    #shelltools.export("CXX", "clang++")
-    #shelltools.export("AR", "llvm-ar")
-    #shelltools.export("NM", "llvm-nm")
-    #shelltools.export("RANLIB", "llvm-ranlib")
+    pisitools.ldflags.add("-fuse-ld=lld")
+    pisitools.cflags.remove("-D_FORTIFY_SOURCE=2")
+    pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2")
+    shelltools.export("CC", "clang")
+    shelltools.export("CXX", "clang++")
+    shelltools.export("AR", "llvm-ar")
+    shelltools.export("NM", "llvm-nm")
+    shelltools.export("RANLIB", "llvm-ranlib")
     
 
     if get.buildTYPE() == "emul32":
-        shelltools.export("CC", "gcc -m32")
-        shelltools.export("CXX", "g++ -m32")
+        #shelltools.export("CC", "gcc -m32")
+        #shelltools.export("CXX", "g++ -m32")
         #shelltools.export("CC", "clang -m32")
         #shelltools.export("CXX", "clang++ -m32")
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
@@ -44,9 +44,9 @@ def setup():
         #shelltools.cd("tools")
         #shelltools.system("patch -p1 < enable-SSP-and-PIE-by-default.patch")
         #shelltools.cd("..")
-    else:
-        shelltools.export("CC", "gcc")
-        shelltools.export("CXX", "g++")
+    #else:
+        #shelltools.export("CC", "gcc")
+        #shelltools.export("CXX", "g++")
         #shelltools.export("CC", "clang")
         #shelltools.export("CXX", "clang++")
 
@@ -63,8 +63,8 @@ def setup():
                           
     
     if get.buildTYPE() == "emul32":
-        shelltools.export("CC", "gcc -m32")
-        shelltools.export("CXX", "g++ -m32")
+        #shelltools.export("CC", "gcc -m32")
+        #shelltools.export("CXX", "g++ -m32")
         pisitools.cflags.add("-m32 ")
         pisitools.cxxflags.add("-m32")        
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
@@ -76,6 +76,9 @@ def setup():
     cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
                           -G 'Unix Makefiles' \
                           %s \
+                          -DCMAKE_AR=/usr/bin/llvm-ar \
+                          -DCMAKE_NM=/usr/bin/llvm-nm \
+                          -DCMAKE_RANLIB=/usr/bin/llvm-ranlib \
                           -DLLVM_ENABLE_PROJECTS='%s' \
                           -DLLVM_LIBDIR_SUFFIX=%s \
                           -DLLVM_ENABLE_FFI=ON \
@@ -88,10 +91,7 @@ def setup():
                           -DLLVM_INCLUDEDIR=/usr/include \
                           -DLLVM_ENABLE_ASSERTIONS=OFF \
                           -DFFI_INCLUDE_DIR=/usr/include \
-                          -DCOMPILER_RT_USE_LIBCXX=OFF" % (options, projects, libsuffix), sourceDir=".." )
-                          #-DCMAKE_AR=/usr/bin/llvm-ar \
-                          #-DCMAKE_NM=/usr/bin/llvm-nm \
-                          #-DCMAKE_RANLIB=/usr/bin/llvm-ranlib \
+                          -DCOMPILER_RT_USE_LIBCXX=OFF" % (options, projects, libsuffix), sourceDir=".." ) 
 
 def build():
     shelltools.cd("build")
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index e5825971a0..2505592543 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -26,11 +26,11 @@
             <Dependency versionFrom="3.8.6">python3-devel</Dependency>
             <!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin -->
 <!--            <Dependency>binutils</Dependency-->
-            <Dependency>gcc</Dependency>
-            <!--Dependency>llvm</Dependency>
+<!--             <Dependency>gcc</Dependency> -->
+            <Dependency>llvm</Dependency>
             <Dependency>llvm-clang-devel</Dependency>
             <Dependency>lld</Dependency> 
-            <Dependency>llvm-polly</Dependency-->
+            <Dependency>llvm-polly</Dependency>
         </BuildDependencies>
         <!--<AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="../support-linking-ScopPassManager-against-LLVM-dylib.patch">support-linking-ScopPassManager-against-LLVM-dylib.patch</AdditionalFile>
@@ -86,7 +86,7 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/libLLVM*.so</Path>
-            <Path fileType="library">/usr/lib/libLLVM*.so.11</Path>
+            <Path fileType="library">/usr/lib/libLLVM*.so.12</Path>
             <Path fileType="library">/usr/lib/LLVMgold.*</Path>
             <Path fileType="library">/usr/lib/libLTO.*</Path>
             <Path fileType="library">/usr/lib/libRemarks.so*</Path>
@@ -234,6 +234,18 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>llvm-clang-32bit</Name>
+        <Summary>A C language family front-end for LLVM</Summary>
+        <Description>The goal of the Clang project is to create a new C, C++, Objective C and Objective C++ front-end for the LLVM compiler.</Description>
+        <Files>
+            <Path fileType="library">/usr/lib32/libclang*</Path>
+            <Path fileType="library">/usr/lib32/clang/</Path>
+            <Path fileType="library">/usr/lib32/libfindAllSymbols.so*</Path>
+            <Path fileType="data">/usr/lib32/cmake/clang/Clang*</Path>
+        </Files>
+    </Package>
+
     <Package>
         <Name>llvm-clang-devel</Name>
         <Summary>Development headers for llvm-clang</Summary>
@@ -242,7 +254,7 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/clang</Path>
-            <Path fileType="header">/usr/lib/clang/11.0.0/include</Path>
+            <Path fileType="header">/usr/lib/clang/12.0.1/include</Path>
             <Path fileType="header">/usr/include/clang-c</Path>
             <Path fileType="header">/usr/include/clang-tidy</Path>
         </Files>
@@ -305,6 +317,7 @@
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency release="current">llvm</Dependency>
+            <Dependency release="current">llvm-clang-32bit</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libxml2-32bit</Dependency>
             <Dependency>ncurses-32bit</Dependency>