diff options
| author | ryoon <ryoon@pkgsrc.org> | 2021-08-11 12:28:53 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2021-08-11 12:28:53 +0000 |
| commit | 84c25a8e0ae784f698bee714b3bf8387489c205d (patch) | |
| tree | 8c5104e976160ff3476291cdca898c91379ad6bb | |
| parent | 038514ba8dd9bdecfd499b80fb4e130f6837375e (diff) | |
| download | pkgsrc-84c25a8e0ae784f698bee714b3bf8387489c205d.tar.gz | |
rust: Do not mix i586-unknown-netbsd and i686-unknown-netbsd
The mix of i586-unknown-netbsd and i686-unknown-netbsd targets
leads partial misdetection of external llvm from lang/llvm.
It adds -DLLVM_RUSTLLVM to CFLAGS and -DLLVM_RUSTLLVM breaks
PassWrapper.c build with external llvm.
Fix PR pkg/56304.
| -rw-r--r-- | lang/rust/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 1b3708228dd..4fa81e86195 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.242 2021/07/11 22:13:38 he Exp $ +# $NetBSD: Makefile,v 1.243 2021/08/11 12:28:53 ryoon Exp $ DISTNAME= rustc-1.52.1-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -271,6 +271,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} #DIST_SUBDIR= ${PKGNAME} # For atomic ops CFLAGS+= -march=i586 +CONFIGURE_ARGS+= --build=${RUST_ARCH} pre-build-fix: ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc |