diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 9765ebe..9f2f1ea 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -82,7 +82,7 @@
 
 # Top level for eMMC variant targets
 $(TARGET_EMMC_BOOTLOADER): $(emmc_appsbootldr_clean) | $(EMMC_BOOTLOADER_OUT) $(INSTALLED_KEYSTOREIMAGE_TARGET)
-	$(KERNEL_MAKE_CMD) -C bootable/bootloader/lk COMPILER=$(KERNEL_HOST_TOOLCHAIN_ROOT)gcc TOOLCHAIN_PREFIX=$(CROSS_COMPILE) BOOTLOADER_OUT=../../../$(EMMC_BOOTLOADER_OUT) $(BOOTLOADER_PLATFORM) EMMC_BOOT=1 $(SIGNED_KERNEL) $(VERIFIED_BOOT) $(DEVICE_STATUS)
+	$(KERNEL_MAKE_CMD) -C bootable/bootloader/lk COMPILER=$(CLANG_PREBUILTS)/bin/clang HOSTCFLAGS="-fuse-ld=lld" TOOLCHAIN_PREFIX=$(CROSS_COMPILE) BOOTLOADER_OUT=../../../$(EMMC_BOOTLOADER_OUT) $(BOOTLOADER_PLATFORM) EMMC_BOOT=1 $(SIGNED_KERNEL) $(VERIFIED_BOOT) $(DEVICE_STATUS)
 
 # Keep build NAND & eMMC as default for targets still using TARGET_BOOTLOADER
 TARGET_BOOTLOADER := $(PRODUCT_OUT)/EMMCBOOT.MBN
diff --git a/target/FP2/tools/makefile b/target/FP2/tools/makefile
index 2757e07..13c5c5e 100644
--- a/target/FP2/tools/makefile
+++ b/target/FP2/tools/makefile
@@ -8,6 +8,7 @@
 
 SRC_DIR  := target/$(TARGET)/tools
 COMPILER := gcc
+HOSTCFLAGS :=
 
 ifeq ($(EMMC_BOOT), 1)
   APPSBOOTHDR_FILES := EMMCBOOT.MBN
@@ -41,4 +42,4 @@
 
 mkheader: $(SRC_DIR)/mkheader.c
 	@mkdir -p $(BUILDDIR)
-	${COMPILER} -DMEMBASE=$(MEMBASE) $(SRC_DIR)/mkheader.c -o $(BUILDDIR)/mkheader
+	${COMPILER} ${HOSTCFLAGS} -DMEMBASE=$(MEMBASE) $(SRC_DIR)/mkheader.c -o $(BUILDDIR)/mkheader