diff --git a/scripts/Makefile.toolchain.xtools b/scripts/Makefile.toolchain.xtools
index 14b7af27320d8..6fb8c412eaa6d 100644
--- a/scripts/Makefile.toolchain.xtools
+++ b/scripts/Makefile.toolchain.xtools
@@ -1,32 +1,27 @@
 ifndef XTOOLS_TOOLCHAIN_PATH
+
+ifeq ($(CROSS_COMPILE),)
 $(error XTOOLS_TOOLCHAIN_PATH is not set)
+else
+CROSS_COMPILE_TARGET = $(patsubst %-,%,${CROSS_COMPILE})
+CROSS_COMPILE_ROOT = $(dir $(shell which ${CROSS_COMPILE}gcc))/..
 endif
 
-ifndef MAKEFILE_TOOLCHAIN_DO_PASS2
+else
 
-# arm
 CROSS_COMPILE_TARGET_arm = arm-none-eabi
-
-# x86
-CROSS_COMPILE_TARGET_x86 = i586-unknown-elf
+CROSS_COMPILE_TARGET_x86 = i586-pc-elf
 
 CROSS_COMPILE_TARGET = ${CROSS_COMPILE_TARGET_${ARCH}}
 CROSS_COMPILE_ROOT = ${XTOOLS_TOOLCHAIN_PATH}/${CROSS_COMPILE_TARGET}
-
-else
-
 CROSS_COMPILE = ${CROSS_COMPILE_ROOT}/bin/${CROSS_COMPILE_TARGET}-
 
+endif
+
 TOOLCHAIN_CFLAGS = -I${CROSS_COMPILE_ROOT}/${CROSS_COMPILE_TARGET}/sysroot/usr/include
 TOOLCHAIN_LIBS = gcc
 
 CROSS_COMPILE_version = $(shell $(CROSS_COMPILE)gcc -dumpversion)
 LIB_INCLUDE_DIR += -L ${CROSS_COMPILE_ROOT}/lib/gcc/${CROSS_COMPILE_TARGET}/${CROSS_COMPILE_version}/
 
-endif
-
 export CROSS_COMPILE TOOLCHAIN_LIBS LIB_INCLUDE_DIR TOOLCHAIN_CFLAGS
-
-ifndef MAKEFILE_TOOLCHAIN_DO_PASS2
-MAKEFILE_TOOLCHAIN_DO_PASS2=true
-endif