diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index f5dfe10..bc094aa 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -1,168 +1,200 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
 
 cc_library(
-  name = 'empty_main',
-  srcs = [ 'empty_main.c' ],
+    name = "empty_main",
+    srcs = ["empty_main.c"],
 )
 
 cc_library(
-  name = 'malloc',
-  deps = select({
-    '//tools:has_asan': [],
-    '//tools:has_tsan': [],
-    '//tools:cpu_cortex_m4f': [],
-    '//conditions:default': ['//third_party/gperftools:tcmalloc'],
-  }),
+    name = "malloc",
+    deps = select({
+        "//tools:has_asan": [],
+        "//tools:has_tsan": [],
+        "//tools:cpu_cortex_m4f": [],
+        "//conditions:default": ["//third_party/gperftools:tcmalloc"],
+    }),
 )
 
 cc_library(
-  name = 'stl',
+    name = "stl",
 )
 
 filegroup(
-  name = 'empty',
-  srcs = [],
+    name = "empty",
+    srcs = [],
 )
 
 # This is the entry point for --crosstool_top.
 cc_toolchain_suite(
-  name = 'toolchain',
-  toolchains = {
-    'k8|clang': ':cc-compiler-k8',
-    'roborio|gcc': ':cc-compiler-roborio',
-    'armhf-debian|clang': 'cc-compiler-armhf-debian',
-    'cortex-m4f|gcc': 'cc-compiler-cortex-m4f',
-  },
+    name = "toolchain",
+    toolchains = {
+        "k8|clang": ":cc-compiler-k8",
+        "roborio|gcc": ":cc-compiler-roborio",
+        "armhf-debian|clang": "cc-compiler-armhf-debian",
+        "cortex-m4f|gcc": "cc-compiler-cortex-m4f",
+    },
 )
 
 # Compiler inputs given by --copt etc in //tools:bazel.rc.
 filegroup(
-  name = 'flags_compiler_inputs',
-  srcs = select({
-    '//tools:has_asan': [
-      'asan-blacklist',
+    name = "flags_compiler_inputs",
+    srcs = select({
+        "//tools:has_asan": [
+            "asan-blacklist",
+        ],
+        "//tools:has_ubsan": [
+            "ubsan-blacklist",
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+filegroup(
+    name = "clang_3p6_all_files",
+    srcs = [
+        ":flags_compiler_inputs",
+        "//tools/cpp/clang_3p6:as",
+        "//tools/cpp/clang_3p6:tool-wrappers",
+        "@clang_3p6_repo//:compiler_pieces",
     ],
-    '//tools:has_ubsan': [
-      'ubsan-blacklist',
+)
+
+filegroup(
+    name = "clang_3p6_linker_files",
+    srcs = [
+        "//tools/cpp/clang_3p6:ar",
+        "//tools/cpp/clang_3p6:clang",
+        "//tools/cpp/clang_3p6:clang-symlinks",
+        "//tools/cpp/clang_3p6:ld",
+        "@clang_3p6_repo//:compiler_pieces",
     ],
-    '//conditions:default': [],
-  }),
+)
+
+filegroup(
+    name = "clang_3p6_compiler_files",
+    srcs = [
+        "//tools/cpp/clang_3p6:clang",
+        "//tools/cpp/clang_3p6:ld",
+        "@clang_3p6_repo//:compiler_components",
+        "@clang_3p6_repo//:compiler_pieces",
+    ],
 )
 
 cc_toolchain(
-  name = 'cc-compiler-k8',
-  all_files = ':flags_compiler_inputs',
-  compiler_files = ':flags_compiler_inputs',
-  cpu = 'local',
-  dwp_files = ':empty',
-  dynamic_runtime_libs = [':empty'],
-  linker_files = ':empty',
-  objcopy_files = ':empty',
-  static_runtime_libs = [':empty'],
-  strip_files = ':empty',
-  supports_param_files = 1,
+    name = "cc-compiler-k8",
+    all_files = ":clang_3p6_all_files",
+    compiler_files = ":clang_3p6_compiler_files",
+    cpu = "k8",
+    dwp_files = ":empty",
+    dynamic_runtime_libs = [":empty"],
+    linker_files = ":clang_3p6_linker_files",
+    objcopy_files = "//tools/cpp/clang_3p6:objcopy",
+    static_runtime_libs = [":empty"],
+    strip_files = "//tools/cpp/clang_3p6:strip",
+    supports_param_files = 1,
 )
 
 filegroup(
-  name = 'roborio-compiler-files',
-  srcs = [
-    '//tools/cpp/arm-frc-linux-gnueabi:tool-wrappers',
-    '//tools/cpp/arm-frc-linux-gnueabi:as',
-    '@arm_frc_linux_gnueabi_repo//:compiler_pieces',
-    ':flags_compiler_inputs',
-  ],
+    name = "roborio-compiler-files",
+    srcs = [
+        ":flags_compiler_inputs",
+        "//tools/cpp/arm-frc-linux-gnueabi:as",
+        "//tools/cpp/arm-frc-linux-gnueabi:tool-wrappers",
+        "@arm_frc_linux_gnueabi_repo//:compiler_pieces",
+    ],
 )
 
 filegroup(
-  name = 'roborio_linker_files',
-  srcs = [
-    '//tools/cpp/arm-frc-linux-gnueabi:ld',
-    '//tools/cpp/arm-frc-linux-gnueabi:ar',
-    '//tools/cpp/arm-frc-linux-gnueabi:gcc',
-    '//tools/cpp/arm-frc-linux-gnueabi:libs',
-    '@arm_frc_linux_gnueabi_repo//:compiler_pieces',
-  ],
+    name = "roborio_linker_files",
+    srcs = [
+        "//tools/cpp/arm-frc-linux-gnueabi:ar",
+        "//tools/cpp/arm-frc-linux-gnueabi:gcc",
+        "//tools/cpp/arm-frc-linux-gnueabi:ld",
+        "//tools/cpp/arm-frc-linux-gnueabi:libs",
+        "@arm_frc_linux_gnueabi_repo//:compiler_pieces",
+    ],
 )
+
 filegroup(
-  name = 'roborio_compiler_files',
-  srcs = [
-    '//tools/cpp/arm-frc-linux-gnueabi:gcc',
-    '//tools/cpp/arm-frc-linux-gnueabi:ld',
-    '@arm_frc_linux_gnueabi_repo//:compiler_components',
-    '@arm_frc_linux_gnueabi_repo//:compiler_pieces',
-  ],
+    name = "roborio_compiler_files",
+    srcs = [
+        "//tools/cpp/arm-frc-linux-gnueabi:gcc",
+        "//tools/cpp/arm-frc-linux-gnueabi:ld",
+        "@arm_frc_linux_gnueabi_repo//:compiler_components",
+        "@arm_frc_linux_gnueabi_repo//:compiler_pieces",
+    ],
 )
 
 cc_toolchain(
-  name = 'cc-compiler-roborio',
-  all_files = ':roborio-compiler-files',
-  compiler_files = ':roborio_compiler_files',
-  cpu = 'roborio',
-  dwp_files = ':empty',
-  dynamic_runtime_libs = [':empty'],
-  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',
-  supports_param_files = 1,
+    name = "cc-compiler-roborio",
+    all_files = ":roborio-compiler-files",
+    compiler_files = ":roborio_compiler_files",
+    cpu = "roborio",
+    dwp_files = ":empty",
+    dynamic_runtime_libs = [":empty"],
+    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",
+    supports_param_files = 1,
 )
 
 filegroup(
-  name = 'linaro-gcc-files',
-  srcs = [
-    '//tools/cpp/linaro_linux_gcc:clang-symlinks',
-    '//tools/cpp/linaro_linux_gcc:tool-wrappers',
-    '@linaro_linux_gcc_4_9_repo//:compiler_pieces',
-  ],
+    name = "linaro-gcc-files",
+    srcs = [
+        "//tools/cpp/linaro_linux_gcc:clang-symlinks",
+        "//tools/cpp/linaro_linux_gcc:tool-wrappers",
+        "@linaro_linux_gcc_4_9_repo//:compiler_pieces",
+    ],
 )
 
 filegroup(
-  name = 'linaro_linux_linker_files',
-  srcs = [
-    '//tools/cpp/linaro_linux_gcc:gcc',
-    '//tools/cpp/linaro_linux_gcc:ld',
-    '//tools/cpp/linaro_linux_gcc:ar',
-    '//tools/cpp/linaro_linux_gcc:clang-ld',
-    '//tools/cpp/linaro_linux_gcc:clang',
-    '@linaro_linux_gcc_4_9_repo//:compiler_pieces',
-    '//tools/cpp/linaro_linux_gcc:clang-symlinks',
-  ],
+    name = "linaro_linux_linker_files",
+    srcs = [
+        "//tools/cpp/linaro_linux_gcc:ar",
+        "//tools/cpp/linaro_linux_gcc:clang",
+        "//tools/cpp/linaro_linux_gcc:clang-ld",
+        "//tools/cpp/linaro_linux_gcc:clang-symlinks",
+        "//tools/cpp/linaro_linux_gcc:gcc",
+        "//tools/cpp/linaro_linux_gcc:ld",
+        "@linaro_linux_gcc_4_9_repo//:compiler_pieces",
+    ],
 )
 
 filegroup(
-  name = 'linaro_linux_compiler_files',
-  srcs = [
-    '//tools/cpp/linaro_linux_gcc:gcc',
-    '//tools/cpp/linaro_linux_gcc:ld',
-    '//tools/cpp/linaro_linux_gcc:clang',
-    '//tools/cpp/linaro_linux_gcc:as',
-  ],
+    name = "linaro_linux_compiler_files",
+    srcs = [
+        "//tools/cpp/linaro_linux_gcc:as",
+        "//tools/cpp/linaro_linux_gcc:clang",
+        "//tools/cpp/linaro_linux_gcc:gcc",
+        "//tools/cpp/linaro_linux_gcc:ld",
+    ],
 )
 
 cc_toolchain(
-  name = 'cc-compiler-armhf-debian',
-  all_files = ':linaro-gcc-files',
-  compiler_files = ':linaro_linux_compiler_files',
-  cpu = 'armhf',
-  dwp_files = ':empty',
-  dynamic_runtime_libs = [':empty'],
-  linker_files = ':linaro_linux_linker_files',
-  objcopy_files = '//tools/cpp/linaro_linux_gcc:objcopy',
-  static_runtime_libs = [':empty'],
-  strip_files = '//tools/cpp/linaro_linux_gcc:strip',
-  supports_param_files = 1,
+    name = "cc-compiler-armhf-debian",
+    all_files = ":linaro-gcc-files",
+    compiler_files = ":linaro_linux_compiler_files",
+    cpu = "armhf",
+    dwp_files = ":empty",
+    dynamic_runtime_libs = [":empty"],
+    linker_files = ":linaro_linux_linker_files",
+    objcopy_files = "//tools/cpp/linaro_linux_gcc:objcopy",
+    static_runtime_libs = [":empty"],
+    strip_files = "//tools/cpp/linaro_linux_gcc:strip",
+    supports_param_files = 1,
 )
 
 cc_toolchain(
-  name = 'cc-compiler-cortex-m4f',
-  all_files = ':empty',
-  compiler_files = ':empty',
-  cpu = 'cortex-m4',
-  dwp_files = ':empty',
-  dynamic_runtime_libs = [':empty'],
-  linker_files = '//motors/core:linkerscript',
-  objcopy_files = ':empty',
-  static_runtime_libs = [':empty'],
-  strip_files = ':empty',
-  supports_param_files = 0,
+    name = "cc-compiler-cortex-m4f",
+    all_files = ":empty",
+    compiler_files = ":empty",
+    cpu = "cortex-m4",
+    dwp_files = ":empty",
+    dynamic_runtime_libs = [":empty"],
+    linker_files = "//motors/core:linkerscript",
+    objcopy_files = ":empty",
+    static_runtime_libs = [":empty"],
+    strip_files = ":empty",
+    supports_param_files = 0,
 )