diff --git a/cc_toolchain/wrappers/BUILD b/cc_toolchain/wrappers/BUILD
new file mode 100644
index 0000000..68cc5c3
--- /dev/null
+++ b/cc_toolchain/wrappers/BUILD
@@ -0,0 +1,8 @@
+filegroup(
+    name = "all",
+    srcs = [
+        "//cc_toolchain/wrappers/posix:all",
+        "//cc_toolchain/wrappers/windows:all",
+    ],
+    visibility = ["//visibility:public"],
+)
diff --git a/cc_toolchain/wrappers/clang/BUILD b/cc_toolchain/wrappers/clang/BUILD
deleted file mode 100644
index e313fd4..0000000
--- a/cc_toolchain/wrappers/clang/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-filegroup(
-    name = "all",
-    srcs = [
-        "//toolchains/clang/clang_wrappers/nix:all",
-        "//toolchains/clang/clang_wrappers/windows:all",
-    ],
-    visibility = ["//visibility:public"],
-)
diff --git a/cc_toolchain/wrappers/clang/posix/BUILD b/cc_toolchain/wrappers/clang/posix/BUILD
deleted file mode 100755
index 9d46cc3..0000000
--- a/cc_toolchain/wrappers/clang/posix/BUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "all",
-    srcs = [
-        "ar",
-        "cpp",
-        "gcc",
-        "gcov",
-        "ld",
-        "llvm-cov",
-        "nm",
-        "objcopy",
-        "objdump",
-        "strip",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-filegroup(
-    name = "objcopy_alias",
-    srcs = ["objcopy"],
-    visibility = ["//visibility:public"],
-)
diff --git a/cc_toolchain/wrappers/clang/posix/gcc b/cc_toolchain/wrappers/clang/posix/gcc
deleted file mode 100755
index 09b8562..0000000
--- a/cc_toolchain/wrappers/clang/posix/gcc
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-# Workaround to replace all system includes with user includes
-external/$REMOTE_REPOSITORY/bin/clang "${@}"
-#external/arm-none-eabi-compiler/bin/arm-none-eabi-gcc "$@"
diff --git a/cc_toolchain/wrappers/clang/posix/gcov b/cc_toolchain/wrappers/clang/posix/gcov
deleted file mode 100755
index 573fe02..0000000
--- a/cc_toolchain/wrappers/clang/posix/gcov
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-profdata "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/llvm-cov b/cc_toolchain/wrappers/clang/posix/llvm-cov
deleted file mode 100755
index cd09d16..0000000
--- a/cc_toolchain/wrappers/clang/posix/llvm-cov
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-cov "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/objcopy b/cc_toolchain/wrappers/clang/posix/objcopy
deleted file mode 100755
index a02cfee..0000000
--- a/cc_toolchain/wrappers/clang/posix/objcopy
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-objcopy "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/strip b/cc_toolchain/wrappers/clang/posix/strip
deleted file mode 100755
index 6636695..0000000
--- a/cc_toolchain/wrappers/clang/posix/strip
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-strip "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/windows/cpp.bat b/cc_toolchain/wrappers/clang/windows/cpp.bat
deleted file mode 100755
index 22cfa97..0000000
--- a/cc_toolchain/wrappers/clang/windows/cpp.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-:: Workaround to replace all system includes with user includes
-@ECHO OFF
-external\com_llvm_compiler\bin\clang++.exe %* 
-::external\arm-none-eabi-compiler.exe\bin\arm-none-eabi-cpp.exe %*
diff --git a/cc_toolchain/wrappers/clang/windows/nm.bat b/cc_toolchain/wrappers/clang/windows/nm.bat
deleted file mode 100755
index f892c93..0000000
--- a/cc_toolchain/wrappers/clang/windows/nm.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_llvm_compiler\bin\llvm-nm.exe %*
diff --git a/cc_toolchain/wrappers/clang/windows/objcopy.bat b/cc_toolchain/wrappers/clang/windows/objcopy.bat
deleted file mode 100755
index f642ef4..0000000
--- a/cc_toolchain/wrappers/clang/windows/objcopy.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_llvm_compiler\bin\llvm-objcopy.exe %*
diff --git a/cc_toolchain/wrappers/clang/windows/objdump.bat b/cc_toolchain/wrappers/clang/windows/objdump.bat
deleted file mode 100755
index 7573d0b..0000000
--- a/cc_toolchain/wrappers/clang/windows/objdump.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_llvm_compiler\bin\llvm-objdump.exe %*
diff --git a/cc_toolchain/wrappers/clang/windows/strip.bat b/cc_toolchain/wrappers/clang/windows/strip.bat
deleted file mode 100755
index a801946..0000000
--- a/cc_toolchain/wrappers/clang/windows/strip.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_llvm_compiler\bin\llvm-strip.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/BUILD b/cc_toolchain/wrappers/gcc_arm_none_eabi/BUILD
deleted file mode 100644
index 7011cc9..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-filegroup(
-    name = "all",
-    srcs = [
-        "//toolchains/gcc_arm_none_eabi/gcc_wrappers/nix:all",
-        "//toolchains/gcc_arm_none_eabi/gcc_wrappers/windows:all",
-    ],
-    visibility = ["//visibility:public"],
-)
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/ar b/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/ar
deleted file mode 100755
index a281741..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/ar
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-ar "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/cpp b/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/cpp
deleted file mode 100755
index 9106397..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-# Workaround to replace all system includes with user includes
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-g++ "${@}" -fdiagnostics-color=always
-#external/arm-none-eabi-compiler/bin/arm-none-eabi-cpp "$@"
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/gcc b/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/gcc
deleted file mode 100755
index b6ad168..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/gcc
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-# Workaround to replace all system includes with user includes
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-gcc "${@}" -fdiagnostics-color=always
-#external/arm-none-eabi-compiler/bin/arm-none-eabi-gcc "$@"
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/ld b/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/ld
deleted file mode 100644
index cd6e14e..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/ld
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-ld "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/nm b/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/nm
deleted file mode 100755
index 7e5e351..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/nm
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-nm "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/objcopy b/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/objcopy
deleted file mode 100755
index e2b02a0..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/objcopy
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-objcopy "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/objdump b/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/objdump
deleted file mode 100755
index 6f254f8..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/objdump
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-objdump "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/strip b/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/strip
deleted file mode 100755
index 39813f9..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/strip
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -euo pipefail
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-strip "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/BUILD b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/BUILD
deleted file mode 100644
index 73f6dd6..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/BUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# MIT License
-#
-# Copyright (c) 2019 Nathaniel Brough
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "all",
-    srcs = [
-        "ar.bat",
-        "cpp.bat",
-        "gcc.bat",
-        "gcov.bat",
-        "ld.bat",
-        "nm.bat",
-        "objcopy.bat",
-        "objdump.bat",
-        "strip.bat",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-filegroup(
-    name = "objcopy_alias",
-    srcs = ["objcopy.bat"],
-    visibility = ["//visibility:public"],
-)
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/ar.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/ar.bat
deleted file mode 100755
index 755bf8f..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/ar.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-ar.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/cpp.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/cpp.bat
deleted file mode 100755
index df7d572..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/cpp.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-:: Workaround to replace all system includes with user includes
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-g++.exe %* -fdiagnostics-color=always
-::external\arm-none-eabi-compiler.exe\bin\arm-none-eabi-cpp.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/gcc.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/gcc.bat
deleted file mode 100755
index b660d35..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/gcc.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-:: Workaround to replace all system includes with user includes
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-gcc.exe %* -fdiagnostics-color=always
-
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/gcov.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/gcov.bat
deleted file mode 100755
index 1d36c5f..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/gcov.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-gcov.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/ld.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/ld.bat
deleted file mode 100644
index 067e566..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/ld.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-ld.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/nm.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/nm.bat
deleted file mode 100755
index b4f217f..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/nm.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-nm.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/objcopy.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/objcopy.bat
deleted file mode 100755
index 9dc56b3..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/objcopy.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-objcopy.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/objdump.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/objdump.bat
deleted file mode 100755
index ba3b19e..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/objdump.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-objdump.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/strip.bat b/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/strip.bat
deleted file mode 100755
index 11fd15e..0000000
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/windows/strip.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-:: MIT License
-::
-:: Copyright (c) 2019 Nathaniel Brough
-::
-:: Permission is hereby granted, free of charge, to any person obtaining a copy
-:: of this software and associated documentation files (the "Software"), to deal
-:: in the Software without restriction, including without limitation the rights
-:: to use, copy, modify, merge, publish, distribute, sublicense, and\or sell
-:: copies of the Software, and to permit persons to whom the Software is
-:: furnished to do so, subject to the following conditions:
-::
-:: The above copyright notice and this permission notice shall be included in all
-:: copies or substantial portions of the Software.
-::
-:: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-:: IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-:: FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-:: AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-:: LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-:: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-:: SOFTWARE.
-
-@ECHO OFF
-external\com_gcc_arm_none_eabi_compiler\bin\arm-none-eabi-strip.exe %*
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/BUILD b/cc_toolchain/wrappers/posix/BUILD
old mode 100644
new mode 100755
similarity index 92%
rename from cc_toolchain/wrappers/gcc_arm_none_eabi/posix/BUILD
rename to cc_toolchain/wrappers/posix/BUILD
index 3d3e46e..12f28ac
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/BUILD
+++ b/cc_toolchain/wrappers/posix/BUILD
@@ -30,6 +30,7 @@
         "gcc",
         "gcov",
         "ld",
+        "llvm-cov",
         "nm",
         "objcopy",
         "objdump",
@@ -37,9 +38,3 @@
     ],
     visibility = ["//visibility:public"],
 )
-
-filegroup(
-    name = "objcopy_alias",
-    srcs = ["objcopy"],
-    visibility = ["//visibility:public"],
-)
diff --git a/cc_toolchain/wrappers/clang/posix/ar b/cc_toolchain/wrappers/posix/ar
similarity index 96%
rename from cc_toolchain/wrappers/clang/posix/ar
rename to cc_toolchain/wrappers/posix/ar
index d4ab274..13372f8 100755
--- a/cc_toolchain/wrappers/clang/posix/ar
+++ b/cc_toolchain/wrappers/posix/ar
@@ -23,4 +23,4 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-ar "$@"
\ No newline at end of file
+$AR_TOOL_PATH $@
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/cpp b/cc_toolchain/wrappers/posix/cpp
similarity index 96%
rename from cc_toolchain/wrappers/clang/posix/cpp
rename to cc_toolchain/wrappers/posix/cpp
index ca6f7e2..41b6b07 100755
--- a/cc_toolchain/wrappers/clang/posix/cpp
+++ b/cc_toolchain/wrappers/posix/cpp
@@ -24,5 +24,5 @@
 
 set -euo pipefail
 # Workaround to replace all system includes with user includes
-external/$REMOTE_REPOSITORY/bin/clang++ "${@}"
+$CPP_TOOL_PATH $@
 #external/arm-none-eabi-compiler/bin/arm-none-eabi-cpp "$@"
diff --git a/cc_toolchain/wrappers/clang/posix/objdump b/cc_toolchain/wrappers/posix/gcc
similarity index 95%
copy from cc_toolchain/wrappers/clang/posix/objdump
copy to cc_toolchain/wrappers/posix/gcc
index 11c6688..d32bbed 100755
--- a/cc_toolchain/wrappers/clang/posix/objdump
+++ b/cc_toolchain/wrappers/posix/gcc
@@ -23,4 +23,4 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-objdump "$@"
\ No newline at end of file
+$GCC_TOOL_PATH $@
diff --git a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/gcov b/cc_toolchain/wrappers/posix/gcov
similarity index 92%
rename from cc_toolchain/wrappers/gcc_arm_none_eabi/posix/gcov
rename to cc_toolchain/wrappers/posix/gcov
index c6cf64c..8973594 100755
--- a/cc_toolchain/wrappers/gcc_arm_none_eabi/posix/gcov
+++ b/cc_toolchain/wrappers/posix/gcov
@@ -23,4 +23,5 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/com_gcc_arm_none_eabi_compiler/bin/arm-none-eabi-gcov "$@"
\ No newline at end of file
+# TODO: make this compiler independant e.g. remove 'gcov' subcommand.
+$GCC_TOOL_PATH gcov $@
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/ld b/cc_toolchain/wrappers/posix/ld
similarity index 96%
rename from cc_toolchain/wrappers/clang/posix/ld
rename to cc_toolchain/wrappers/posix/ld
index dba6e07..75f8015 100755
--- a/cc_toolchain/wrappers/clang/posix/ld
+++ b/cc_toolchain/wrappers/posix/ld
@@ -23,4 +23,4 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/lld "$@"
\ No newline at end of file
+$LD_TOOL_PATH $@
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/objdump b/cc_toolchain/wrappers/posix/llvm-cov
similarity index 95%
copy from cc_toolchain/wrappers/clang/posix/objdump
copy to cc_toolchain/wrappers/posix/llvm-cov
index 11c6688..cd83887 100755
--- a/cc_toolchain/wrappers/clang/posix/objdump
+++ b/cc_toolchain/wrappers/posix/llvm-cov
@@ -23,4 +23,4 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-objdump "$@"
\ No newline at end of file
+$LLVM_COV_TOOL_PATH $@
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/nm b/cc_toolchain/wrappers/posix/nm
similarity index 96%
rename from cc_toolchain/wrappers/clang/posix/nm
rename to cc_toolchain/wrappers/posix/nm
index 8b09109..4955bbb 100755
--- a/cc_toolchain/wrappers/clang/posix/nm
+++ b/cc_toolchain/wrappers/posix/nm
@@ -23,4 +23,4 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-nm "$@"
\ No newline at end of file
+$NM_TOOL_PATH $@
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/objdump b/cc_toolchain/wrappers/posix/objcopy
similarity index 95%
copy from cc_toolchain/wrappers/clang/posix/objdump
copy to cc_toolchain/wrappers/posix/objcopy
index 11c6688..a4eb557 100755
--- a/cc_toolchain/wrappers/clang/posix/objdump
+++ b/cc_toolchain/wrappers/posix/objcopy
@@ -23,4 +23,4 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-objdump "$@"
\ No newline at end of file
+$OBJCOPY_TOOL_PATH $@
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/objdump b/cc_toolchain/wrappers/posix/objdump
similarity index 95%
rename from cc_toolchain/wrappers/clang/posix/objdump
rename to cc_toolchain/wrappers/posix/objdump
index 11c6688..dbb8072 100755
--- a/cc_toolchain/wrappers/clang/posix/objdump
+++ b/cc_toolchain/wrappers/posix/objdump
@@ -23,4 +23,4 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-objdump "$@"
\ No newline at end of file
+$OBJDUMP_TOOL_PATH $@
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/posix/objdump b/cc_toolchain/wrappers/posix/strip
similarity index 95%
copy from cc_toolchain/wrappers/clang/posix/objdump
copy to cc_toolchain/wrappers/posix/strip
index 11c6688..5c13c22 100755
--- a/cc_toolchain/wrappers/clang/posix/objdump
+++ b/cc_toolchain/wrappers/posix/strip
@@ -23,4 +23,4 @@
 # SOFTWARE.
 
 set -euo pipefail
-external/$REMOTE_REPOSITORY/bin/llvm-objdump "$@"
\ No newline at end of file
+$STRIP_TOOL_PATH "$@"
\ No newline at end of file
diff --git a/cc_toolchain/wrappers/clang/windows/BUILD b/cc_toolchain/wrappers/windows/BUILD
similarity index 100%
rename from cc_toolchain/wrappers/clang/windows/BUILD
rename to cc_toolchain/wrappers/windows/BUILD
diff --git a/cc_toolchain/wrappers/clang/windows/ld.bat b/cc_toolchain/wrappers/windows/ar.bat
old mode 100644
new mode 100755
similarity index 96%
rename from cc_toolchain/wrappers/clang/windows/ld.bat
rename to cc_toolchain/wrappers/windows/ar.bat
index 7fa0675..9db8156
--- a/cc_toolchain/wrappers/clang/windows/ld.bat
+++ b/cc_toolchain/wrappers/windows/ar.bat
@@ -21,4 +21,4 @@
 :: SOFTWARE.
 
 @ECHO OFF
-external\com_llvm_compiler\bin\lld.exe %*
+%AR_TOOL_PATH% %*
diff --git a/cc_toolchain/wrappers/clang/windows/gcc.bat b/cc_toolchain/wrappers/windows/cpp.bat
similarity index 95%
copy from cc_toolchain/wrappers/clang/windows/gcc.bat
copy to cc_toolchain/wrappers/windows/cpp.bat
index 42855ab..62cd3e2 100755
--- a/cc_toolchain/wrappers/clang/windows/gcc.bat
+++ b/cc_toolchain/wrappers/windows/cpp.bat
@@ -22,5 +22,5 @@
 
 :: Workaround to replace all system includes with user includes
 @ECHO OFF
-external\com_llvm_compiler\bin\clang.exe %* 
+%CPP_TOOL_PATH% %*
 
diff --git a/cc_toolchain/wrappers/clang/windows/gcc.bat b/cc_toolchain/wrappers/windows/gcc.bat
similarity index 96%
rename from cc_toolchain/wrappers/clang/windows/gcc.bat
rename to cc_toolchain/wrappers/windows/gcc.bat
index 42855ab..cb828e8 100755
--- a/cc_toolchain/wrappers/clang/windows/gcc.bat
+++ b/cc_toolchain/wrappers/windows/gcc.bat
@@ -22,5 +22,5 @@
 
 :: Workaround to replace all system includes with user includes
 @ECHO OFF
-external\com_llvm_compiler\bin\clang.exe %* 
+%GCC_TOOL_PATH% %*
 
diff --git a/cc_toolchain/wrappers/clang/windows/gcov.bat b/cc_toolchain/wrappers/windows/gcov.bat
similarity index 92%
rename from cc_toolchain/wrappers/clang/windows/gcov.bat
rename to cc_toolchain/wrappers/windows/gcov.bat
index c269dbf..09bf2c0 100755
--- a/cc_toolchain/wrappers/clang/windows/gcov.bat
+++ b/cc_toolchain/wrappers/windows/gcov.bat
@@ -21,4 +21,5 @@
 :: SOFTWARE.
 
 @ECHO OFF
-external\com_llvm_compiler\bin\llvm-cov.exe gcov %*
+:: TODO: make this compiler independant e.g. remove 'gcov' subcommand.
+%GCOV_TOOL_PATH% gcov %*
diff --git a/cc_toolchain/wrappers/clang/windows/ld.bat b/cc_toolchain/wrappers/windows/ld.bat
similarity index 96%
copy from cc_toolchain/wrappers/clang/windows/ld.bat
copy to cc_toolchain/wrappers/windows/ld.bat
index 7fa0675..2ca7d01 100644
--- a/cc_toolchain/wrappers/clang/windows/ld.bat
+++ b/cc_toolchain/wrappers/windows/ld.bat
@@ -21,4 +21,4 @@
 :: SOFTWARE.
 
 @ECHO OFF
-external\com_llvm_compiler\bin\lld.exe %*
+%LD_TOOL_PATH% %*
diff --git a/cc_toolchain/wrappers/clang/windows/ld.bat b/cc_toolchain/wrappers/windows/nm.bat
old mode 100644
new mode 100755
similarity index 96%
copy from cc_toolchain/wrappers/clang/windows/ld.bat
copy to cc_toolchain/wrappers/windows/nm.bat
index 7fa0675..6d8fd1f
--- a/cc_toolchain/wrappers/clang/windows/ld.bat
+++ b/cc_toolchain/wrappers/windows/nm.bat
@@ -21,4 +21,4 @@
 :: SOFTWARE.
 
 @ECHO OFF
-external\com_llvm_compiler\bin\lld.exe %*
+%NM_TOOL_PATH% %*
diff --git a/cc_toolchain/wrappers/clang/windows/ar.bat b/cc_toolchain/wrappers/windows/objcopy.bat
similarity index 95%
rename from cc_toolchain/wrappers/clang/windows/ar.bat
rename to cc_toolchain/wrappers/windows/objcopy.bat
index 5958851..48e3394 100755
--- a/cc_toolchain/wrappers/clang/windows/ar.bat
+++ b/cc_toolchain/wrappers/windows/objcopy.bat
@@ -21,4 +21,4 @@
 :: SOFTWARE.
 
 @ECHO OFF
-external\com_llvm_compiler\bin\llvm-ar.exe %*
+%OBJCOPY_TOOL_PATH% %*
diff --git a/cc_toolchain/wrappers/clang/windows/ar.bat b/cc_toolchain/wrappers/windows/objdump.bat
similarity index 95%
copy from cc_toolchain/wrappers/clang/windows/ar.bat
copy to cc_toolchain/wrappers/windows/objdump.bat
index 5958851..39a5399 100755
--- a/cc_toolchain/wrappers/clang/windows/ar.bat
+++ b/cc_toolchain/wrappers/windows/objdump.bat
@@ -21,4 +21,4 @@
 :: SOFTWARE.
 
 @ECHO OFF
-external\com_llvm_compiler\bin\llvm-ar.exe %*
+%OBJDUMP_TOOL_PATH% %*
diff --git a/cc_toolchain/wrappers/clang/windows/ar.bat b/cc_toolchain/wrappers/windows/strip.bat
similarity index 95%
copy from cc_toolchain/wrappers/clang/windows/ar.bat
copy to cc_toolchain/wrappers/windows/strip.bat
index 5958851..3363a29 100755
--- a/cc_toolchain/wrappers/clang/windows/ar.bat
+++ b/cc_toolchain/wrappers/windows/strip.bat
@@ -21,4 +21,4 @@
 :: SOFTWARE.
 
 @ECHO OFF
-external\com_llvm_compiler\bin\llvm-ar.exe %*
+%STRIP_TOOL_PATH% %*