diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index 464653c43a..773903f4b2 100644
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -23,21 +23,21 @@ 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")
-    pisitools.cflags.add("-mllvm -polly -Wno-unused-command-line-argument")
-    pisitools.cxxflags.add("-mllvm -polly -Wno-unused-command-line-argument")
-    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")
+    #pisitools.cflags.add("-mllvm -polly -Wno-unused-command-line-argument")
+    #pisitools.cxxflags.add("-mllvm -polly -Wno-unused-command-line-argument")
+    #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")
@@ -46,9 +46,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++")
 
@@ -65,10 +65,10 @@ 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")        
+        pisitools.cxxflags.add("-m32")
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
         options = "  -DCMAKE_INSTALL_PREFIX=/emul32 \
                      -DLLVM_TARGET_ARCH:STRING=i686  \
@@ -78,9 +78,6 @@ 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 \
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index aff75a7ca3..7c64d96b35 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -200,7 +200,7 @@
             <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib/clang/13.0.0/lib/linux/*.so</Path>
+            <Path fileType="library">/usr/lib/clang/13.0.1/lib/linux/*.so</Path>
         </Files>
     </Package>
 
@@ -252,7 +252,7 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/clang</Path>
-            <Path fileType="header">/usr/lib/clang/13.0.0/include</Path>
+            <Path fileType="header">/usr/lib/clang/13.0.1/include</Path>
             <Path fileType="header">/usr/include/clang-c</Path>
             <Path fileType="header">/usr/include/clang-tidy</Path>
         </Files>