Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/lang/mozjs78/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/lang/mozjs78/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- pkgsrc/lang/mozjs78/Makefile	2021/05/24 19:52:34	1.20
+++ pkgsrc/lang/mozjs78/Makefile	2021/06/14 22:07:35	1.21
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/05/24 19:52:34 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2021/06/14 22:07:35 gutteridge Exp $
 
 DISTNAME=	mozjs78_78.4.0.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
@@ -34,9 +34,20 @@ CONFIGURE_ARGS+=	--disable-debug-symbols
 CONFIGURE_ARGS+=	--enable-strip
 CONFIGURE_ARGS+=	--with-intl-api
 # --disable-optimize
+
 # For rustc/cargo detection
+.include "../../mk/bsd.prefs.mk"
+
+# This is to work around build failures where an upstream configuration script
+# is confused by having more than one approximate match to MACHINE_GNU_PLATFORM
+# "i486" when attempting to select the Rust compiler target.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+CONFIGURE_ARGS+=	--target=i586-unknown-netbsd
+CONFIGURE_ARGS+=	--host=i586-unknown-netbsd
+.else
 CONFIGURE_ARGS+=	--target=${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM}
+.endif
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-pie