diff --git a/src/python/pants/backend/native/subsystems/native_toolchain.py b/src/python/pants/backend/native/subsystems/native_toolchain.py
index 119b1cf943ac..05f88ea10bae 100644
--- a/src/python/pants/backend/native/subsystems/native_toolchain.py
+++ b/src/python/pants/backend/native/subsystems/native_toolchain.py
@@ -5,8 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.backend.native.subsystems.clang import Clang
 from pants.backend.native.subsystems.gcc import GCC
+from pants.backend.native.subsystems.clang import LLVM
 from pants.backend.native.subsystems.platform_specific.darwin.xcode_cli_tools import XCodeCLITools
 from pants.backend.native.subsystems.platform_specific.linux.binutils import Binutils
 from pants.binaries.binary_tool import ExecutablePathProvider
@@ -41,7 +41,7 @@ class NativeToolchain(Subsystem, ExecutablePathProvider):
 
   # This is a list of subsystems which implement `ExecutablePathProvider` and
   # can be provided for all supported platforms.
-  _CROSS_PLATFORM_SUBSYSTEMS = [Clang, GCC]
+  _CROSS_PLATFORM_SUBSYSTEMS = [LLVM, GCC]
 
   # This is a map of {<platform> -> [<subsystem_cls>, ...]}; the key is the
   # normalized OS name, and the value is a list of subsystem class objects that