diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 9af22d49bb1..dc7ecdd9ed4 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -12,13 +12,12 @@ license="GPL-3, LGPL-3"
 homepage="http://www.gnu.org/software/${pkgname}"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
-nocross=yes   # only works for same wordsize and endianess
 
-post_extract() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) sed -i '/strtol_l/{N;d}' libguile/i18n.c;;
-	esac
-}
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	hostmakedepends+=" guile"
+fi
+
 libguile_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
@@ -27,6 +26,7 @@ libguile_package() {
 		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
 	}
 }
+
 guile-devel_package() {
 	short_desc+=" - development files"
 	depends="gmp-devel libguile>=${version}_${revision}"