From 5af318bd563345c0205dfd1060e90c0368054dc6 Mon Sep 17 00:00:00 2001 From: Hugo Beauzée-Luyssen Date: Mon, 27 May 2019 15:51:44 +0200 Subject: rustc: codegen: Build import library for all windows targets So far it is assumed that using a DLL as a -l parameter argument is ok, but the assumption doesn't hold when compiling the native code with llvm. In which case, an import library is required, so let's build one This also requires the cargo counterpart to add the import library in the stamp files, at least when compiling libstd. Otherwise, the files don't get uplifted --- src/bootstrap/compile.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/bootstrap') diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 9ced04a5c80..60138e701bd 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1126,6 +1126,7 @@ pub fn run_cargo(builder: &Builder<'_>, // Skip files like executables if !filename.ends_with(".rlib") && !filename.ends_with(".lib") && + !filename.ends_with(".a") && !is_dylib(&filename) && !(is_check && filename.ends_with(".rmeta")) { continue; -- cgit 1.4.1-3-g733a5 From ce315cd2fe84def8c65e321161a98ce073472ecb Mon Sep 17 00:00:00 2001 From: Hugo Beauzée-Luyssen Date: Mon, 27 May 2019 16:32:00 +0200 Subject: bootstrap: Build startup object for all windows-gnu target So that uwp-windows-gnu also gets its startup objects built --- src/bootstrap/compile.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bootstrap') diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 60138e701bd..4cd793adaf5 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -325,7 +325,7 @@ impl Step for StartupObjects { fn run(self, builder: &Builder<'_>) { let for_compiler = self.compiler; let target = self.target; - if !target.contains("pc-windows-gnu") { + if !target.contains("windows-gnu") { return } -- cgit 1.4.1-3-g733a5