CVS commit: pkgsrc/lang/rust

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Apr 20 13:22:31 UTC 2020

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
As discussed on IRC, use the same environment for build and install.
This avoids cargo deciding to rebuild most packages just because it now
knows the DESTDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 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.159 pkgsrc/lang/rust/Makefile:1.160
--- pkgsrc/lang/rust/Makefile:1.159     Thu Mar 26 20:05:29 2020
+++ pkgsrc/lang/rust/Makefile   Mon Apr 20 13:22:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.159 2020/03/26 20:05:29 rillig Exp $
+# $NetBSD: Makefile,v 1.160 2020/04/20 13:22:31 joerg Exp $
 
 DISTNAME=      rustc-1.42.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -360,12 +360,12 @@ pre-build: pre-build-fix
 
 do-build:
        cd ${WRKSRC} \
-       && ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} \
+       && ${_ULIMIT_CMD} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
                ${PYTHONBIN} ./x.py -v ${BUILD_TARGET} -j ${_MAKE_JOBS_N}
 
 do-install:
        cd ${WRKSRC} \
-       && ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \
+       && ${_ULIMIT_CMD} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
                ${PYTHONBIN} ./x.py -v install -j ${_MAKE_JOBS_N}
 
 GENERATE_PLIST+=       find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \