diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index 16d6c6fa38..6f7cf8992b 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 -rtlib=compiler-rt -stdlib=libc++")
-    #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,8 +56,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")
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index 434705fd05..32327a70b4 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -27,11 +27,9 @@
             <!-- 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>libcxx-devel</Dependency--> 
-            <!--Dependency>compiler-rt</Dependency-->
+            <Dependency>lld</Dependency> 
         </BuildDependencies>
         <!--<AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="../support-linking-ScopPassManager-against-LLVM-dylib.patch">support-linking-ScopPassManager-against-LLVM-dylib.patch</AdditionalFile>