diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index beef65fd41..a2fc011535 100755
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -13,9 +13,12 @@ libdir = "/usr/lib32/llvm" if get.buildTYPE() == "emul32" else "/usr/lib/llvm"
 lib = "lib32" if get.buildTYPE() == "emul32" else "lib"
 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(" --rtlib=libgcc --unwindlib=libgcc")
 	
     if get.buildTYPE() != "emul32":
             if not shelltools.can_access_directory("tools/clang"):
@@ -83,7 +86,6 @@ def setup():
                                         -DFFI_INCLUDE_DIR=/usr/lib/libffi-3.2.1/include \
                                         -DCOMPILER_RT_USE_LIBCXX=OFF \
                                         -DLIBOMP_USE_HIER_SCHED=ON \
-                                        -DCLANG_DEFAULT_UNWINDLIB=libunwind \
                                         -DENABLE_SHARED=ON" % (options), sourceDir=".." ) 
 
 def build():
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index aedfd82a24..3807300388 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -205,6 +205,7 @@
             <Path fileType="executable">/usr/bin/c-index-test</Path>
             <Path fileType="executable">/usr/bin/tblgen</Path>
             <Path fileType="library">/usr/lib/libclang*</Path>
+			<Path fileType="library">/usr/lib/clang/</Path>
 <!--             <Path fileType="library">/usr/lib/liblldbPluginExpressionParserClang.a</Path> -->
 <!--             <Path fileType="library">/usr/lib/liblldbPluginObjCLanguage.a</Path> -->
             <Path fileType="man">/usr/share/man/man1/clang.1</Path>