rust-1.20.0:First release
This commit is contained in:
+32
@@ -0,0 +1,32 @@
|
||||
From 5dbc650a60ddb230f59e5a18ffd298b033566945 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
|
||||
Date: Thu, 20 Jul 2017 23:07:01 +0200
|
||||
Subject: [PATCH] librustc_llvm/build: Force link against libffi
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
`llvm-config --libs` doesn't output libffi in many cases. Fixing it
|
||||
turned out to take quite a bit of effort, so force libffi linking in
|
||||
here for now.
|
||||
|
||||
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
|
||||
---
|
||||
src/librustc_llvm/build.rs | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
|
||||
index 3f0f536960..7dc0c40c9d 100644
|
||||
--- a/src/librustc_llvm/build.rs
|
||||
+++ b/src/librustc_llvm/build.rs
|
||||
@@ -220,6 +220,7 @@ fn main() {
|
||||
};
|
||||
println!("cargo:rustc-link-lib={}={}", kind, name);
|
||||
}
|
||||
+ println!("cargo:rustc-link-lib=dylib=ffi");
|
||||
|
||||
// LLVM ldflags
|
||||
//
|
||||
--
|
||||
2.13.3
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
[build]
|
||||
python = "python2.7"
|
||||
extended = true
|
||||
# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
|
||||
verbose = 0
|
||||
# Build the sanitizer runtimes
|
||||
#sanitizers = false
|
||||
|
||||
[install]
|
||||
prefix = "/usr"
|
||||
|
||||
[rust]
|
||||
codegen-units = 0
|
||||
debuginfo = true
|
||||
|
||||
# Whether or not line number debug information is emitted
|
||||
#debuginfo-lines = false
|
||||
|
||||
channel = "stable"
|
||||
|
||||
[target.x86_64-unknown-linux-gnu]
|
||||
llvm-config = "/usr/bin/llvm-config"
|
||||
|
||||
[target.i686-unknown-linux-gnu]
|
||||
llvm-config = "/usr/bin/llvm-config"
|
||||
Reference in New Issue
Block a user