diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index bc094aa..3bee68e 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -71,6 +71,14 @@
 )
 
 filegroup(
+    name = "clang_3p6_strip_files",
+    srcs = [
+        "//tools/cpp/clang_3p6:strip",
+        "@clang_3p6_repo//:compiler_pieces",
+    ],
+)
+
+filegroup(
     name = "clang_3p6_compiler_files",
     srcs = [
         "//tools/cpp/clang_3p6:clang",
@@ -90,7 +98,7 @@
     linker_files = ":clang_3p6_linker_files",
     objcopy_files = "//tools/cpp/clang_3p6:objcopy",
     static_runtime_libs = [":empty"],
-    strip_files = "//tools/cpp/clang_3p6:strip",
+    strip_files = ":clang_3p6_strip_files",
     supports_param_files = 1,
 )
 
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-as b/tools/cpp/clang_3p6/x86_64-linux-gnu-as
index f264544..461f584 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-as
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-as
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 exec -a as \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/as \
   "$@"
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-cpp b/tools/cpp/clang_3p6/x86_64-linux-gnu-cpp
index adf3869..5bc6499 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-cpp
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-cpp
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 exec -a cpp \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/cpp \
   "$@"
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-gcc b/tools/cpp/clang_3p6/x86_64-linux-gnu-gcc
index 4fe1d67..1d0e502 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-gcc
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-gcc
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/gcc/x86_64-linux-gnu/4.9:$PATH" \
   exec \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/gcc \
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-gcov b/tools/cpp/clang_3p6/x86_64-linux-gnu-gcov
index e71ab3e..58b621c 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-gcov
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-gcov
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 exec -a gcov \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/gcov \
   "$@"
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-ld b/tools/cpp/clang_3p6/x86_64-linux-gnu-ld
index 803a818..9f59f2e 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-ld
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-ld
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 exec -a ld \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/ld \
   "$@"
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-nm b/tools/cpp/clang_3p6/x86_64-linux-gnu-nm
index f8d1eb7..f0b12c8 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-nm
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-nm
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 exec -a nm \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/nm \
   "$@"
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-objcopy b/tools/cpp/clang_3p6/x86_64-linux-gnu-objcopy
index 2a49155..55b6b3d 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-objcopy
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-objcopy
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 exec -a objcopy \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/objcopy \
   "$@"
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-objdump b/tools/cpp/clang_3p6/x86_64-linux-gnu-objdump
index a549b29..194ffe9 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-objdump
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-objdump
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 exec -a objdump \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/objdump \
   "$@"
diff --git a/tools/cpp/clang_3p6/x86_64-linux-gnu-strip b/tools/cpp/clang_3p6/x86_64-linux-gnu-strip
index 0817069..c53f8dd 100755
--- a/tools/cpp/clang_3p6/x86_64-linux-gnu-strip
+++ b/tools/cpp/clang_3p6/x86_64-linux-gnu-strip
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/lib"
+export LD_LIBRARY_PATH
+
 exec -a strip \
   ${BAZEL_OUTPUT_ROOT}external/clang_3p6_repo/usr/bin/strip \
   "$@"