diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index a5c170ff98..3a7e031130 100644
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -19,11 +19,11 @@ 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++")
+    #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++")
     
 
     #if get.buildTYPE() == "emul32":
@@ -56,10 +56,10 @@ def setup():
                           
     
     if get.buildTYPE() == "emul32":
-        #shelltools.export("CC", "gcc -m32")
-        #shelltools.export("CXX", "g++ -m32")
-        pisitools.cflags.add("-m32 ")
-        pisitools.cxxflags.add("-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")
         options = "  -DCMAKE_INSTALL_PREFIX=/emul32 \
                      -DLLVM_TARGET_ARCH:STRING=i686  \
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index aaba99a5ae..0f0346e427 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -27,10 +27,10 @@
             <!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin -->
             <Dependency>binutils</Dependency>
             <Dependency>gcc</Dependency>
-            <Dependency>llvm</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>
@@ -300,7 +300,7 @@
             <Dependency>libffi-32bit</Dependency>
             <Dependency>libxml2-32bit</Dependency>
             <Dependency>ncurses-32bit</Dependency>
-            <Dependency>libcxx-32bit</Dependency> 
+<!--             <Dependency>libcxx-32bit</Dependency>  -->
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency release="current">llvm</Dependency>
@@ -309,7 +309,7 @@
             <Dependency>ncurses-32bit</Dependency>
             <Dependency>zlib-32bit</Dependency>
             <Dependency>libffi-32bit</Dependency>
-            <Dependency>libcxx-32bit</Dependency> 
+<!--             <Dependency>libcxx-32bit</Dependency>  -->
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/llvm-config-32</Path>