Index: head/lang/rust/Makefile
===================================================================
--- head/lang/rust/Makefile
+++ head/lang/rust/Makefile
@@ -134,7 +134,7 @@
 		exit 1;\
 	fi
 
-LIBSTD=	rust-std-1.16.0-x86_64-unknown-freebsd/rust-std-x86_64-unknown-freebsd/lib/rustlib/x86_64-unknown-freebsd/lib/libstd-aef6cb139bd07bdc.rlib
+LIBSTD=	rust-std-1.16.0-${RUST_ARCH_${ARCH}}-unknown-freebsd/rust-std-${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/rustlib/${RUST_ARCH_${ARCH}}-unknown-freebsd/lib/libstd-aef6cb139bd07bdc.rlib
 STDF=	std-aef6cb139bd07bdc.0.o
 
 post-extract:
@@ -143,6 +143,10 @@
 		${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR}
 	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUSTC_BOOTSTRAP} \
 		${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR}
+.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1200031
+	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP} \
+		${WRKSRC}/build/cache/${RUST_BOOTSTRAP_DIR}
+.endif
 	${LN} -sf ${DISTDIR}/${DIST_SUBDIR}/${CARGO_BOOTSTRAP} \
 		${WRKSRC}/build/cache/${CARGO_BOOTSTRAP_DIR}
 	${TAR} -x -C ${WRKSRC} -f ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD_BOOTSTRAP}
@@ -152,7 +156,7 @@
 	${LD} -r -o ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF} ${WRKSRC}/old_fstat.o
 	${MV} ${WRKSRC}/std.xx.o ${WRKSRC}/${STDF}
 	(cd ${WRKSRC} && ${AR} r ${WRKSRC}/${LIBSTD} ${STDF})
-	${TAR} -cy -C ${WRKSRC} -f ${WRKSRC}/rustc.tbz rust-std-1.16.0-x86_64-unknown-freebsd
+	${TAR} -cy -C ${WRKSRC} -f ${WRKSRC}/rustc.tbz rust-std-1.16.0-${RUST_ARCH_${ARCH}}-unknown-freebsd
 	${MV} ${WRKSRC}/rustc.tbz ${WRKSRC}/build/cache/${RUST_STD_BOOTSTRAP}
 .endif
 
Index: head/lang/rust/files/extra-patch-ino64
===================================================================
--- head/lang/rust/files/extra-patch-ino64
+++ head/lang/rust/files/extra-patch-ino64
@@ -41,16 +41,16 @@
          pub st_gid: ::gid_t,
 +        pub st_pad1: ::uint32_t,
          pub st_rdev: ::dev_t,
-+        pub st_atime_ext ::i32,
++        pub st_atime_ext: ::int32_t,
          pub st_atime: ::time_t,
          pub st_atime_nsec: ::c_long,
-+        pub st_mtime_ext ::i32,
++        pub st_mtime_ext: ::int32_t,
          pub st_mtime: ::time_t,
          pub st_mtime_nsec: ::c_long,
-+        pub st_ctime_ext ::i32,
++        pub st_ctime_ext: ::int32_t,
          pub st_ctime: ::time_t,
          pub st_ctime_nsec: ::c_long,
-+        pub st_birthtime_ext ::i32,
++        pub st_birthtime_ext: ::int32_t,
 +        pub st_birthtime: ::time_t,
 +        pub st_birthtime_nsec: ::c_long,
          pub st_size: ::off_t,