CVS commit: pkgsrc/lang/rust

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jun 17 21:43:18 UTC 2025

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
rust: fix build on Darwin (aarch64 and x86_64)


To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 pkgsrc/lang/rust/Makefile

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

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.339 pkgsrc/lang/rust/Makefile:1.340
--- pkgsrc/lang/rust/Makefile:1.339     Tue Jun 17 15:19:17 2025
+++ pkgsrc/lang/rust/Makefile   Tue Jun 17 21:43:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.339 2025/06/17 15:19:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.340 2025/06/17 21:43:18 adam Exp $
 
 DISTNAME=      rustc-1.86.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -104,8 +104,8 @@ PKGSRC_MAKE_ENV+=   LD_LIBRARY_PATH=${RUST
 # bootstrap compiler arguments and the stage1 libraries cannot be found.
 # Ideally this should be inserted only in the necessary points of the
 # bootstrap script.
-.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
-MAKE_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/build/aarch64-apple-darwin/stage1/lib
+.if ${OPSYS} == "Darwin"
+MAKE_ENV+=     DYLD_LIBRARY_PATH="${WRKSRC}/build/${MACHINE_ARCH}-apple-darwin/stage1/lib:${WRKSRC}/build/${MACHINE_ARCH}-apple-darwin/stage2/lib"
 .endif
 
 # Allow overriding MAKE_JOBS_SAFE