From 638ebbc5859a38794408a988ffec6f54e0dc0f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Tue, 2 Jun 2020 23:18:41 +0200 Subject: [PATCH] Move copying of MinGW CRT to the better location --- src/bootstrap/compile.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 56d72d72b610..4f58e55f2140 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -196,6 +196,13 @@ fn copy_self_contained_objects( "crt1.o", &mut target_deps, ); + } else if target.contains("windows-gnu") { + for obj in ["crt2.o", "dllcrt2.o"].iter() { + let src = compiler_file(builder, builder.cc(target), target, obj); + let target = libdir.join(obj); + builder.copy(&src, &target); + target_deps.push(target); + } } target_deps @@ -419,13 +426,6 @@ impl Step for StartupObjects { target_deps.push(target); } - for obj in ["crt2.o", "dllcrt2.o"].iter() { - let src = compiler_file(builder, builder.cc(target), target, obj); - let target = sysroot_dir.join(obj); - builder.copy(&src, &target); - target_deps.push(target); - } - target_deps } }