diff options
| author | tnn <tnn@pkgsrc.org> | 2019-02-12 11:49:15 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2019-02-12 11:49:15 +0000 |
| commit | 3069a4d6fef7b0c638ba94bf263e01b5477f423f (patch) | |
| tree | 20e26750c42574d3b30fc09683d43282f9ede42f /lang | |
| parent | 2e747b6e9163d6348fa1dcd7a6b0ebce6d4b983b (diff) | |
| download | pkgsrc-3069a4d6fef7b0c638ba94bf263e01b5477f423f.tar.gz | |
delete duplicated LD_LIBRARY_PATH declarations
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/rust/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index c7a8ba89055..fd32e19e775 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2019/01/22 09:17:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.77 2019/02/12 11:49:15 tnn Exp $ DISTNAME= rustc-1.32.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -80,7 +80,7 @@ BUILD_TARGET= build # Getting RPATH with $ORIGIN into bootstrap may be troublesome, so # uncommenting the LD_LIBRARY_PATH setting may be required to run # the bootstrap -MAKE_ENV+= LD_LIBRARY_PATH=${WRKDIR}/rust-bootstrap/lib +PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) # Bootstrapping on NetBSD/powerpc requires no debug-info from rustc @@ -260,9 +260,6 @@ RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils TOOLS_CREATE+= md5sum TOOLS_PATH.md5sum= ${PREFIX}/bin/gmd5sum -.else -LD_LIBRARY_PATH= ${RUST_BOOTSTRAP_PATH}/lib -PKGSRC_MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH:Q} .endif SUBST_CLASSES+= rpath |