Reduce difference to wip/rust/:

 * Remove a few commented-out entries/settings
 * Add @PREFIX@ substitution to the netbsd_base.rs patch,
   and adjust patch accordingly.

3 files changed, 6 insertions, 11 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 65f4f0fe5e3..37c2f8fba10 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.213 2021/01/03 16:46:18 he Exp $
+# $NetBSD: Makefile,v 1.214 2021/01/03 18:23:14 he Exp $
 
 DISTNAME=	rustc-1.48.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
@@ -37,7 +37,6 @@ CONFIGURE_ARGS+=		--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=		--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=		--python=${PYTHONBIN}
 CONFIGURE_ARGS+=		--release-channel=stable
-#CONFIGURE_ARGS+=		--enable-local-rust
 CONFIGURE_ARGS+=		--local-rust-root=${RUST_BOOTSTRAP_PATH}
 CONFIGURE_ARGS+=		--enable-extended	# Build and install cargo too.
 CONFIGURE_ARGS+=		--enable-rpath
@@ -45,8 +44,6 @@ CONFIGURE_ARGS+=		--disable-codegen-tests
 CONFIGURE_ARGS+=		--disable-dist-src
 CONFIGURE_ARGS+=		--disable-llvm-static-stdcpp
 CONFIGURE_ARGS+=		--disable-ninja
-# XXX: to be enabled in the future
-#CONFIGURE_ARGS+=		--jemalloc-root=${BUILDLINK_PREFIX.jemalloc}/lib
 
 # Include (optional) settings to cross-build rust
 .include "cross.mk"
@@ -58,9 +55,6 @@ BUILD_TARGET=		dist
 BUILD_TARGET=		build
 .endif
 
-# More diag when failing
-#MAKE_ENV+=		RUST_BACKTRACE=1
-
 # Getting RPATH with $ORIGIN into bootstrap may be troublesome, so
 # uncommenting the LD_LIBRARY_PATH setting may be required to run
 # the bootstrap
@@ -321,6 +315,7 @@ TOOLS_PLATFORM.gzcat=	${PREFIX}/bin/gzip -cd
 SUBST_CLASSES+=		rpath
 SUBST_STAGE.rpath=	pre-configure
 SUBST_FILES.rpath+=	compiler/rustc_codegen_ssa/src/back/linker.rs
+SUBST_FILES.rpath+=	compiler/rustc_target/src/spec/netbsd_base.rs
 SUBST_FILES.rpath+=	src/bootstrap/builder.rs
 SUBST_FILES.rpath+=	src/bootstrap/compile.rs
 SUBST_VARS.rpath=	PREFIX
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index e37a90d5abf..c171adf6ae4 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.124 2021/01/03 08:53:11 jperkin Exp $
+$NetBSD: distinfo,v 1.125 2021/01/03 18:23:14 he Exp $
 
 SHA1 (rust-1.47.0-aarch64-unknown-netbsd.tar.gz) = f0b42fe4c567ffb0d83b523854bca4fa67d4167e
 RMD160 (rust-1.47.0-aarch64-unknown-netbsd.tar.gz) = e5d079b0920aa02b16b4a9804867e6d1118833eb
@@ -106,7 +106,7 @@ SHA512 (rustc-1.48.0-src.tar.gz) = e28e5f0813cfd94fb92399a2d64aa19bdf0933b5fc768
 Size (rustc-1.48.0-src.tar.gz) = 154487032 bytes
 SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 72746bbf0fa5e72fe151c95e3876b9eb1e70ae39
 SHA1 (patch-compiler_rustc__llvm_build.rs) = 42ff9f15004426e9e6d134bf1364df997f78964d
-SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 61d2a0d0d7947a7e272c97a5bb773b6e2d6d3a81
+SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = c3a7ad7c218c405f5408562f720186cbfd4c665b
 SHA1 (patch-compiler_rustc__target_src_spec_solaris__base.rs) = 362534c5af4d59d33e049fb771df0fc9f8d8505b
 SHA1 (patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs) = ba9216104891f8d2c239c9dd8d62e2c0c444360c
 SHA1 (patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure) = 5dc1cfc843894156b513c86453db5032917a5529
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
index 2954dc4255c..5f2a4fe7c74 100644
--- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
+++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_netbsd__base.rs,v 1.1 2021/01/01 20:44:48 he Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_netbsd__base.rs,v 1.2 2021/01/03 18:23:14 he Exp $
 
 For the benefit of powerpc, when libatomic-links is installed,
 search the directory containing the symlinks to -latomic.
@@ -10,7 +10,7 @@ search the directory containing the symlinks to -latomic.
              // specifying libraries to link to.
              "-Wl,--as-needed".to_string(),
 +	    // For the benefit of powerpc, when libatomic-links is installed,
-+            "-Wl,-L/usr/pkg/lib/libatomic".to_string(),
++            "-Wl,-L@PREFIX@/lib/libatomic".to_string(),
          ],
      );