diff options
| author | joerg <joerg@pkgsrc.org> | 2020-04-20 13:22:31 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-04-20 13:22:31 +0000 |
| commit | ebe8b46512f54fde47bfa3b92c114ff88a149daf (patch) | |
| tree | 5d37e2f8a9406d9a1d635260571be88e49a67169 /lang | |
| parent | fcd5a86b03f5b67e400e94eaf7a690ef5d95f49d (diff) | |
| download | pkgsrc-ebe8b46512f54fde47bfa3b92c114ff88a149daf.tar.gz | |
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.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/rust/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 7ab1279cc29..89e229c6eea 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -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 | \ |