diff --git a/cmake/compiler/clang.cmake b/cmake/compiler/clang.cmake
index d43dbdfa1b7..eca694a49a0 100644
--- a/cmake/compiler/clang.cmake
+++ b/cmake/compiler/clang.cmake
@@ -9,6 +9,16 @@ if(NOT DEFINED NOSYSDEF_CFLAG)
   set(NOSYSDEF_CFLAG -undef)
 endif()
 
+set(CMAKE_C_COMPILER   ${CLANG_ROOT}/bin/clang)
+set(CMAKE_CXX_COMPILER ${CLANG_ROOT}/bin/clang++)
+set(CMAKE_AR           ${CLANG_ROOT}/bin/llvm-ar		CACHE INTERNAL " " FORCE)
+set(CMAKE_LINKER       ${CLANG_ROOT}/bin/llvm-link		CACHE INTERNAL " " FORCE)
+set(CMAKE_NM           ${CLANG_ROOT}/bin/llvm-nm		CACHE INTERNAL " " FORCE)
+set(CMAKE_OBJDUMP      ${CLANG_ROOT}/bin/llvm-objdump	CACHE INTERNAL " " FORCE)
+set(CMAKE_RANLIB       ${CLANG_ROOT}/bin/llvm-ranlib	CACHE INTERNAL " " FORCE)
+set(CMAKE_OBJCOPY                    objcopy			CACHE INTERNAL " " FORCE)
+set(CMAKE_READELF                    readelf			CACHE INTERNAL " " FORCE)
+
 foreach(file_name include include-fixed)
   execute_process(
     COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name}
diff --git a/cmake/toolchain/llvm.cmake b/cmake/toolchain/llvm.cmake
index fe682f29009..a67845924d7 100644
--- a/cmake/toolchain/llvm.cmake
+++ b/cmake/toolchain/llvm.cmake
@@ -1,5 +1,6 @@
 set(CLANG_ROOT $ENV{CLANG_ROOT_DIR})
 set_ifndef(CLANG_ROOT /usr)
+
 set(COMPILER clang)
 
 if("${ARCH}" STREQUAL "arm")
@@ -9,16 +10,6 @@ elseif("${ARCH}" STREQUAL "x86")
   set(triple i686-pc-none-elf)
 endif()
 
-set(CMAKE_C_COMPILER          ${CLANG_ROOT}/bin/clang)
 set(CMAKE_C_COMPILER_TARGET   ${triple})
 set(CMAKE_ASM_COMPILER_TARGET ${triple})
-set(CMAKE_CXX_COMPILER        ${CLANG_ROOT}/bin/clang++)
 set(CMAKE_CXX_COMPILER_TARGET ${triple})
-set(CMAKE_AR                  "${CLANG_ROOT}/bin/llvm-ar"  CACHE INTERNAL " " FORCE)
-set(CMAKE_LINKER              "${CLANG_ROOT}/bin/llvm-link" CACHE INTERNAL " " FORCE)
-SET(CMAKE_NM                  "${CLANG_ROOT}/bin/llvm-nm"       CACHE INTERNAL " " FORCE)
-SET(CMAKE_OBJDUMP             "${CLANG_ROOT}/bin/llvm-objdump" CACHE INTERNAL " " FORCE)
-SET(CMAKE_RANLIB              "${CLANG_ROOT}/bin/llvm-ranlib" CACHE INTERNAL " " FORCE)
-set(CMAKE_OBJCOPY             objcopy CACHE INTERNAL " " FORCE)
-set(CMAKE_READELF             readelf CACHE INTERNAL " " FORCE)
-