diff --git a/overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-0.0.1-r6.ebuild b/overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-0.0.1-r7.ebuild
similarity index 85%
rename from overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-0.0.1-r6.ebuild
rename to overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-0.0.1-r7.ebuild
index 79c2ef9..5017f51 100644
--- a/overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-0.0.1-r6.ebuild
+++ b/overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-0.0.1-r7.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-CROS_WORKON_COMMIT="3d2b9922e81cce898d4f09306563d3ca9d32c67e"
-CROS_WORKON_TREE="7e526af2a180321c53cf4c9c4fba5685e61461ec"
+CROS_WORKON_COMMIT="a910c096139769e35720174069e81e89bf90fdc6"
+CROS_WORKON_TREE="e67e7bd1e5eab3eb5cb6643599eb7d5d12c20ddd"
 CROS_WORKON_PROJECT="chromiumos/platform/cobble"
 CROS_WORKON_LOCALNAME="../platform/cobble"
 CROS_WORKON_SUBTREE="grub-lakitu"
@@ -23,7 +23,7 @@
 
 # The ordering doesn't seem to matter.
 PLATFORMS=( "efi" )
-TARGETS=( "x86_64" )
+TARGETS=( "${CHOST}" )
 
 src_unpack() {
 	cros-workon_src_unpack
@@ -31,7 +31,6 @@
 }
 
 src_prepare() {
-	cros_use_gcc
 	default
 	sed -i -e /autoreconf/d autogen.sh || die
 	bash autogen.sh || die
@@ -46,6 +45,10 @@
 	multijob_init
 	for platform in "${PLATFORMS[@]}" ; do
 		for target in "${TARGETS[@]}" ; do
+			# Grub does not search for clang when choosing a cross-compiler; it
+			# only searches for gcc, egcs, and cc (in that order). To work
+			# around this, explicitly set TARGET_CC to the compiler type in CC.
+			export TARGET_CC="${target}-${CC#"${CHOST}-"}"
 			mkdir -p ${target}-${platform}-build
 			pushd ${target}-${platform}-build >/dev/null
 			# GRUB defaults to a --program-prefix set based on target
@@ -63,6 +66,8 @@
 				--bindir=/bin \
 				--libdir=/$(get_libdir) \
 				--with-platform=${platform} \
+				--build=${CBUILD} \
+				--host=${CBUILD} \
 				--target=${target} \
 				--prefix="${D}"
 			popd >/dev/null
diff --git a/overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-9999.ebuild b/overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-9999.ebuild
index e5cba4d..7255294 100644
--- a/overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-9999.ebuild
+++ b/overlay-lakitu/sys-boot/grub-lakitu/grub-lakitu-9999.ebuild
@@ -21,7 +21,7 @@
 
 # The ordering doesn't seem to matter.
 PLATFORMS=( "efi" )
-TARGETS=( "x86_64" )
+TARGETS=( "${CHOST}" )
 
 src_unpack() {
 	cros-workon_src_unpack
@@ -29,7 +29,6 @@
 }
 
 src_prepare() {
-	cros_use_gcc
 	default
 	sed -i -e /autoreconf/d autogen.sh || die
 	bash autogen.sh || die
@@ -44,6 +43,10 @@
 	multijob_init
 	for platform in "${PLATFORMS[@]}" ; do
 		for target in "${TARGETS[@]}" ; do
+			# Grub does not search for clang when choosing a cross-compiler; it
+			# only searches for gcc, egcs, and cc (in that order). To work
+			# around this, explicitly set TARGET_CC to the compiler type in CC.
+			export TARGET_CC="${target}-${CC#"${CHOST}-"}"
 			mkdir -p ${target}-${platform}-build
 			pushd ${target}-${platform}-build >/dev/null
 			# GRUB defaults to a --program-prefix set based on target
@@ -61,6 +64,8 @@
 				--bindir=/bin \
 				--libdir=/$(get_libdir) \
 				--with-platform=${platform} \
+				--build=${CBUILD} \
+				--host=${CBUILD} \
 				--target=${target} \
 				--prefix="${D}"
 			popd >/dev/null