pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/rust rust: Do not mix i586-unknown-netbsd and i68...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed1be88fb378
branches:  trunk
changeset: 456923:ed1be88fb378
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Aug 11 12:28:53 2021 +0000

description:
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.

diffstat:

 lang/rust/Makefile |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r a2d25a51e314 -r ed1be88fb378 lang/rust/Makefile
--- a/lang/rust/Makefile        Wed Aug 11 12:23:30 2021 +0000
+++ b/lang/rust/Makefile        Wed Aug 11 12:28:53 2021 +0000
@@ -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 @@
 #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



Home | Main Index | Thread Index | Old Index