diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index 3bee68e..e5cdcc7 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -133,6 +133,14 @@
     ],
 )
 
+filegroup(
+    name = "roborio_strip_files",
+    srcs = [
+        "//tools/cpp/arm-frc-linux-gnueabi:strip",
+        "@arm_frc_linux_gnueabi_repo//:compiler_pieces",
+    ],
+)
+
 cc_toolchain(
     name = "cc-compiler-roborio",
     all_files = ":roborio-compiler-files",
@@ -143,7 +151,7 @@
     linker_files = ":roborio_linker_files",
     objcopy_files = "//tools/cpp/arm-frc-linux-gnueabi:objcopy",
     static_runtime_libs = [":empty"],
-    strip_files = "//tools/cpp/arm-frc-linux-gnueabi:strip",
+    strip_files = ":roborio_strip_files",
     supports_param_files = 1,
 )
 
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ar b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ar
index d70337f..5725bbb 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ar
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ar
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-ar \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-ar" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-as b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-as
index 5f1a2fc..6e67db8 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-as
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-as
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-as \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-as" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-cpp b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-cpp
index 3262658..d2968e3 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-cpp
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-cpp
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-cpp \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-cpp" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-dwp b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-dwp
index dbd074b..697f65a 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-dwp
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-dwp
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-dwp \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-dwp" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcc b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcc
index aab008a..7b127aa 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcc
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcc
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-gcc" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcov b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcov
index a3c71c3..35d71c2 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcov
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcov
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-gcov \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-gcov" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ld b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ld
index d5dce71..f3dc5ef 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ld
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ld
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-ld \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-ld" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-nm b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-nm
index 4163be0..b9bc2b8 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-nm
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-nm
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-nm \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-nm" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objcopy b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objcopy
index a77d3a9..04381fa 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objcopy
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objcopy
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-objcopy \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-objcopy" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump
index 0de0532..2c6a99c 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-objdump \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-objdump" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip
index 15cc2f9..78a0f65 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip
@@ -1,5 +1,9 @@
 #!/bin/bash --norc
 
+LD_LIBRARY_PATH="${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/usr/lib/x86_64-linux-gnu"
+LD_LIBRARY_PATH+=":${BAZEL_OUTPUT_ROOT}external/arm_frc_gnueabi_deps/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH
+
 exec -a arm-frc-linux-gnueabi-strip \
 	"${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-strip" \
 	"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD
index 438c9f1..a2725fe 100644
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD
@@ -1,108 +1,84 @@
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
-  name = 'gcc',
-  srcs = [
-    'usr/bin/arm-frc-linux-gnueabi-gcc',
-  ],
+    name = "gcc",
+    srcs = [
+        "usr/bin/arm-frc-linux-gnueabi-gcc",
+    ],
 )
 
 filegroup(
-  name = 'ar',
-  srcs = [
-    'usr/bin/arm-frc-linux-gnueabi-ar',
-  ],
+    name = "ar",
+    srcs = [
+        "usr/bin/arm-frc-linux-gnueabi-ar",
+    ],
 )
 
 filegroup(
-  name = 'as',
-  srcs = [
-    'usr/bin/arm-frc-linux-gnueabi-as',
-  ],
+    name = "as",
+    srcs = [
+        "usr/bin/arm-frc-linux-gnueabi-as",
+    ],
 )
 
 filegroup(
-  name = 'ld',
-  srcs = [
-    'usr/bin/arm-frc-linux-gnueabi-ld',
-  ],
+    name = "ld",
+    srcs = [
+        "usr/bin/arm-frc-linux-gnueabi-ld",
+    ],
 )
 
 filegroup(
-  name = 'nm',
-  srcs = [
-    'usr/bin/arm-frc-linux-gnueabi-nm',
-  ],
+    name = "nm",
+    srcs = [
+        "usr/bin/arm-frc-linux-gnueabi-nm",
+    ],
 )
 
 filegroup(
-  name = 'objcopy',
-  srcs = [
-    'usr/bin/arm-frc-linux-gnueabi-objcopy',
-  ],
+    name = "objcopy",
+    srcs = [
+        "usr/bin/arm-frc-linux-gnueabi-objcopy",
+    ],
 )
 
 filegroup(
-  name = 'objdump',
-  srcs = [
-    'usr/bin/arm-frc-linux-gnueabi-objdump',
-  ],
+    name = "objdump",
+    srcs = [
+        "usr/bin/arm-frc-linux-gnueabi-objdump",
+    ],
 )
 
 filegroup(
-  name = 'strip',
-  srcs = [
-    'usr/bin/arm-frc-linux-gnueabi-strip',
-  ],
+    name = "strip",
+    srcs = [
+        "usr/bin/arm-frc-linux-gnueabi-strip",
+    ],
 )
 
 filegroup(
-  name = 'compiler_pieces',
-  srcs = glob([
-    'usr/bin/**/*',
-    'usr/include/**/*',
-    'usr/lib/**/*',
-    'usr/arm-frc-linux-gnueabi/**/*',
-    'usr/lib/x86_64-linux-gnu/gcc/**/*',
-  ]),
+    name = "compiler_pieces",
+    srcs = glob([
+        "usr/bin/**/*",
+        "usr/include/**/*",
+        "usr/lib/**/*",
+        "usr/arm-frc-linux-gnueabi/**/*",
+        "usr/lib/x86_64-linux-gnu/gcc/**/*",
+    ]) + [
+        "@arm_frc_gnueabi_deps",
+    ],
 )
 
 filegroup(
-  name = 'compiler_components',
-  srcs = [
-    ':gcc',
-    ':ar',
-    ':as',
-    ':ld',
-    ':nm',
-    ':objcopy',
-    ':objdump',
-    ':strip',
-  ],
+    name = "compiler_components",
+    srcs = [
+        ":ar",
+        ":as",
+        ":gcc",
+        ":ld",
+        ":nm",
+        ":objcopy",
+        ":objdump",
+        ":strip",
+    ],
 )
-
-cc_library(
-  name = 'librt',
-  srcs = [
-    'usr/arm-frc-linux-gnueabi/usr/lib/librt.so'
-  ],
-)
-
-cc_library(
-  name = 'libdl',
-  srcs = [
-    'usr/arm-frc-linux-gnueabi/usr/lib/libdl.so'
-  ],
-)
-
-cc_library(
-  name = 'libm',
-  srcs = [
-    'usr/arm-frc-linux-gnueabi/usr/lib/libm.so'
-  ],
-)
-
-cc_library(
-  name = 'libpthread',
-)
-