diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index eb18efb626..ded62fc2bd 100755
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -17,7 +17,7 @@ NoStrip = ["/usr/lib/clang/%s/lib/linux" % get.srcVERSION()]
 
 def setup():
 	
-    pisitools.ldflags.add("-fuse-ld=lld")
+    #pisitools.ldflags.add("-fuse-ld=lld")
 	
     if get.buildTYPE() != "emul32":
             if not shelltools.can_access_directory("tools/clang"):
@@ -44,6 +44,9 @@ def setup():
                 shelltools.export("CXX", "clang++")
                 #shelltools.export("CC", "gcc")
                 #shelltools.export("CXX", "g++")
+    else:
+        shelltools.system("tar xf ../clang-%s.src.tar.xz -C tools" % get.srcVERSION())
+        shelltools.move("tools/clang-%s.src" % get.srcVERSION(), "tools/clang")
     
     if get.buildTYPE() == "emul32":
         shelltools.export("CC", "clang -m32")
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index 40cb6ea903..94293ed005 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -33,7 +33,6 @@
             <Dependency>binutils</Dependency>
             <Dependency>llvm-clang</Dependency>	
 <!--             <Dependency>lld</Dependency>			 -->
-<!--             <Dependency>lld</Dependency> -->
         </BuildDependencies>
     </Source>
 
@@ -81,7 +80,7 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/libLLVM*.so</Path>
-			<Path fileType="library">/usr/lib/libLLVM*.so.*</Path>
+			<Path fileType="library">/usr/lib/libLLVM*.so.10</Path>
             <Path fileType="library">/usr/lib/LLVMgold.*</Path>
             <Path fileType="library">/usr/lib/libLTO.*</Path>
 			<Path fileType="library">/usr/lib/libPolly*.so</Path>
@@ -190,6 +189,16 @@
             <Path fileType="executable">/usr/libexec/c++-*</Path>
         </Files>
     </Package>
+	
+    <Package>
+        <Name>compiler-rt</Name>
+        <Summary>Various runtime libraries used by Clang</Summary>
+        <RuntimeDependencies>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/clang/10.0.0/lib/linux/*.so</Path>
+        </Files>
+    </Package>
 
     <Package>
         <Name>llvm-clang</Name>
@@ -214,16 +223,6 @@
             <Path fileType="data">/usr/share/clang</Path>
         </Files>
     </Package>
-	
-   <Package>
-        <Name>compiler-rt</Name>
-        <Summary>Various runtime libraries used by Clang</Summary>
-        <RuntimeDependencies>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib/clang/10.0.0/lib/linux/*.so</Path>
-        </Files>
-    </Package>
 
     <Package>
         <Name>llvm-clang-devel</Name>