Received: by mail.netbsd.org (Postfix, from userid 605) id 07D9E84D7D; Thu, 30 May 2019 14:36:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8160484D27 for ; Thu, 30 May 2019 14:36:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id gbYI-6HelMCE for ; Thu, 30 May 2019 14:36:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0E81E84CD8 for ; Thu, 30 May 2019 14:36:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 08D07FB15; Thu, 30 May 2019 14:36:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155922697668100" MIME-Version: 1.0 Date: Thu, 30 May 2019 14:36:16 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20190530143616.08D07FB15@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_155922697668100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu May 30 14:36:15 UTC 2019 Modified Files: pkgsrc/lang/rust: Makefile Log Message: rust: Switch to pkgsrc LLVM for SunOS temporarily. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 pkgsrc/lang/rust/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155922697668100 Content-Disposition: inline Content-Length: 1682 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/rust/Makefile diff -u pkgsrc/lang/rust/Makefile:1.98 pkgsrc/lang/rust/Makefile:1.99 --- pkgsrc/lang/rust/Makefile:1.98 Tue May 14 15:48:15 2019 +++ pkgsrc/lang/rust/Makefile Thu May 30 14:36:15 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2019/05/14 15:48:15 he Exp $ +# $NetBSD: Makefile,v 1.99 2019/05/30 14:36:15 jperkin Exp $ DISTNAME= rustc-1.34.2-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -42,8 +42,10 @@ CONFIGURE_ARGS+= --disable-llvm-static-s CONFIGURE_ARGS+= --disable-ninja # XXX: to be enabled in the future #CONFIGURE_ARGS+= --jemalloc-root=${BUILDLINK_PREFIX.jemalloc}/lib -#CONFIGURE_ARGS+= --enable-llvm-link-shared -#CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} + +# The bundled LLVM current has issues building on SunOS. +CONFIGURE_ARGS+= --enable-llvm-link-shared +CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} # Use "dist" build target for cross compile of bootstrap #BUILD_TARGET= dist @@ -131,6 +133,13 @@ GCC_REQD+= 4.8 .include "../../mk/bsd.prefs.mk" +# The bundled LLVM current has issues building on SunOS. +.if ${OPSYS} == "SunOS" +.include "../../lang/llvm/buildlink3.mk" +CONFIGURE_ARGS+= --enable-llvm-link-shared +CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} +.endif + # # Under NetBSD, do not use DT_RUNPATH # @@ -467,7 +476,6 @@ stage0-bootstrap: install .include "../../devel/cmake/buildlink3.mk" #.include "../../devel/jemalloc/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -#.include "../../lang/llvm/buildlink3.mk" .include "../../lang/python/tool.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" --_----------=_155922697668100--