about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMateusz Mikuła <mati865@gmail.com>2020-06-02 23:18:41 +0200
committerMateusz Mikuła <mati865@gmail.com>2020-06-11 18:34:23 +0200
commit638ebbc5859a38794408a988ffec6f54e0dc0f0b (patch)
tree87579916b0800408933ff1b727f478f3f526eafe
parent9ceb9bb20324630380153c1db5aeb56a433ab8d9 (diff)
downloadrust-638ebbc5859a38794408a988ffec6f54e0dc0f0b.tar.gz
rust-638ebbc5859a38794408a988ffec6f54e0dc0f0b.zip
Move copying of MinGW CRT to the better location
-rw-r--r--src/bootstrap/compile.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 56d72d72b61..4f58e55f214 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
     }
 }