diff --git a/scripts/cmake/xtensa-toolchain.cmake b/scripts/cmake/xtensa-toolchain.cmake
index c65caa2a934e..0c3127a42425 100644
--- a/scripts/cmake/xtensa-toolchain.cmake
+++ b/scripts/cmake/xtensa-toolchain.cmake
@@ -81,3 +81,9 @@ if(XCC)
 else()
 	string(REGEX MATCH "([^\/\\]+)$" XCC_TOOLS_VERSION "${TOOLCHAIN}")
 endif()
+
+string(LENGTH "${XCC_TOOLS_VERSION}" XCC_TOOLS_VERSION_STR_LEN)
+math(EXPR XCC_TOOLS_VERSION_PADDING "(${XCC_TOOLS_VERSION_STR_LEN} + 1) % 4")
+if(XCC_TOOLS_VERSION_PADDING EQUAL 0)
+	set(XCC_TOOLS_VERSION "<${XCC_TOOLS_VERSION}>")
+endif()