From a3991e750c1b966a95ced77b2e286042ae63ef63 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 23 Mar 2018 17:43:29 +0100 Subject: [PATCH] rust: switch to system llvm4.0 --- srcpkgs/rust/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 3c4f30e6fc0..ba2f01fd1ea 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -14,7 +14,7 @@ build_style=configure make_build_args="dist VERBOSE=1" only_for_archs="i686 x86_64 x86_64-musl" hostmakedepends="cmake curl pkg-config python" -makedepends="libffi-devel ncurses-devel zlib-devel" +makedepends="libffi-devel llvm4.0 ncurses-devel zlib-devel" short_desc="Safe, concurrent, practical systems language" maintainer="Leah Neukirchen " homepage="http://www.rust-lang.org/" @@ -59,6 +59,8 @@ i686) esac post_extract() { + rm -rf src/llvm + mkdir -p stage0 cp -flr ../rustc-*/rustc/* stage0 cp -flr ../rust-std-*/rust-std-*/* stage0 @@ -118,6 +120,7 @@ do_configure() { --disable-docs --disable-codegen-tests --enable-ccache + --llvm-root=/usr --enable-local-rust --local-rust-root=$wrksrc/stage0 "