diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index c957567c2b..5852a0f32d 100755
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -16,7 +16,7 @@ libsuffix = "32" if get.buildTYPE() == "emul32" else ""
 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"):
@@ -39,19 +39,19 @@ def setup():
                 shelltools.system("tar xf ../compiler-rt-%s.src.tar.xz -C projects" % get.srcVERSION())
                 shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt")
         
-                #shelltools.export("CC", "clang")
-                #shelltools.export("CXX", "clang++")
-                shelltools.export("CC", "gcc")
-                shelltools.export("CXX", "g++")
+                shelltools.export("CC", "clang")
+                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")
-        #shelltools.export("CXX", "clang++ -m32")
-        shelltools.export("CC", "gcc -m32")
-        shelltools.export("CXX", "g++ -m32")
+        shelltools.export("CC", "clang -m32")
+        shelltools.export("CXX", "clang++ -m32")
+        #shelltools.export("CC", "gcc -m32")
+        #shelltools.export("CXX", "g++ -m32")
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
     
     shelltools.makedirs("build")
@@ -63,6 +63,7 @@ def setup():
                               -DCMAKE_INSTALL_PREFIX=/usr \
                             -DCMAKE_CXX_FLAGS:STRING=-m64 \
                             -DLLVM_TARGET_ARCH:STRING=x86_64 \
+                            -DLLDB_ENABLE_LUA=OFF \
                             -DLLVM_DEFAULT_TARGET_TRIPLE=%s " % get.HOST()
                           
     
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index dd2873ed8c..a33a4e5091 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -32,8 +32,8 @@
             <!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin -->
             <Dependency>binutils</Dependency>
             <Dependency>gcc</Dependency>
-<!--             <Dependency>llvm-clang</Dependency>	 -->
-<!--             <Dependency>lld</Dependency>			 -->
+            <Dependency>llvm-clang</Dependency>	 
+            <Dependency>lld</Dependency>			 
         </BuildDependencies>
     </Source>
 
@@ -95,6 +95,7 @@
         <Summary>Next generation, high-performance debugger</Summary>
         <RuntimeDependencies>
             <Dependency release="current">llvm-libs</Dependency>
+            <Dependency release="current">llvm-clang</Dependency>
             <Dependency>zlib</Dependency>
             <Dependency>libffi</Dependency>
             <Dependency>libedit</Dependency>
@@ -102,6 +103,7 @@
             <Dependency>ncurses</Dependency>
             <Dependency>python</Dependency>
             <Dependency>libxml2</Dependency>
+            <Dependency>xz</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/argdumper</Path>
@@ -205,6 +207,7 @@
         <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>
         <RuntimeDependencies>
+            <Dependency release="current">llvm</Dependency>
             <Dependency release="current">llvm-libs</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>ncurses</Dependency>