diff --git a/compilers/debian_rootfs.BUILD b/compilers/debian_rootfs.BUILD
index 004b82a..7eef9ec 100644
--- a/compilers/debian_rootfs.BUILD
+++ b/compilers/debian_rootfs.BUILD
@@ -4,8 +4,10 @@
         include = [
             "include/**",
             "lib/**",
+            "lib64/**",
             "usr/include/**",
             "usr/lib/**",
+            "usr/lib64/**",
         ],
         exclude = [
             "usr/share/**",
diff --git a/compilers/linaro_linux_gcc.BUILD b/compilers/linaro_linux_gcc.BUILD
deleted file mode 100644
index f2fae98..0000000
--- a/compilers/linaro_linux_gcc.BUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "gcc",
-    srcs = [
-        "bin/arm-linux-gnueabihf-gcc",
-    ],
-)
-
-filegroup(
-    name = "ar",
-    srcs = [
-        "bin/arm-linux-gnueabihf-ar",
-    ],
-)
-
-filegroup(
-    name = "ld",
-    srcs = [
-        "bin/arm-linux-gnueabihf-ld",
-    ],
-)
-
-filegroup(
-    name = "nm",
-    srcs = [
-        "bin/arm-linux-gnueabihf-nm",
-    ],
-)
-
-filegroup(
-    name = "objcopy",
-    srcs = [
-        "bin/arm-linux-gnueabihf-objcopy",
-    ],
-)
-
-filegroup(
-    name = "objdump",
-    srcs = [
-        "bin/arm-linux-gnueabihf-objdump",
-    ],
-)
-
-filegroup(
-    name = "strip",
-    srcs = [
-        "bin/arm-linux-gnueabihf-strip",
-    ],
-)
-
-filegroup(
-    name = "as",
-    srcs = [
-        "bin/arm-linux-gnueabihf-as",
-    ],
-)
-
-filegroup(
-    name = "compiler_pieces",
-    srcs = glob(
-        include = [
-            "arm-linux-gnueabihf/**",
-            "libexec/**",
-            "lib/gcc/arm-linux-gnueabihf/**",
-            "include/**",
-        ],
-    ) + [
-        "@armhf_debian_rootfs//:sysroot_files",
-    ],
-)
-
-filegroup(
-    name = "compiler_components",
-    srcs = [
-        ":ar",
-        ":as",
-        ":gcc",
-        ":ld",
-        ":nm",
-        ":objcopy",
-        ":objdump",
-        ":strip",
-    ],
-)