diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 08cd64a..888b985 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -517,12 +517,7 @@ else
     toolchain := gcc
   endif
   # "clang ..."
-  ifeq ($(word 1,$(ccvsn)),clang)
-    toolchain := clang
-  endif
-  ifeq ($(word 2,$(ccvsn)),clang)
-    # Some newer clangs have distributor as first word
-    # (ie, Debian, Apple, etc)
+  ifeq ($(findstring clang,$(ccvsn)),clang)
     toolchain := clang
   endif
   ifeq ($(word 1,$(ccvsn)),Open64)