CVS commit: pkgsrc/lang/rust

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Aug 11 12:28:53 UTC 2021

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 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.242 pkgsrc/lang/rust/Makefile:1.243
--- pkgsrc/lang/rust/Makefile:1.242     Sun Jul 11 22:13:38 2021
+++ pkgsrc/lang/rust/Makefile   Wed Aug 11 12:28:53 2021
@@ -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}
 #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