Skip to content

Commit 638ebbc

Browse files
committed
Move copying of MinGW CRT to the better location
1 parent 9ceb9bb commit 638ebbc

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/bootstrap/compile.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,13 @@ fn copy_self_contained_objects(
196196
"crt1.o",
197197
&mut target_deps,
198198
);
199+
} else if target.contains("windows-gnu") {
200+
for obj in ["crt2.o", "dllcrt2.o"].iter() {
201+
let src = compiler_file(builder, builder.cc(target), target, obj);
202+
let target = libdir.join(obj);
203+
builder.copy(&src, &target);
204+
target_deps.push(target);
205+
}
199206
}
200207

201208
target_deps
@@ -419,13 +426,6 @@ impl Step for StartupObjects {
419426
target_deps.push(target);
420427
}
421428

422-
for obj in ["crt2.o", "dllcrt2.o"].iter() {
423-
let src = compiler_file(builder, builder.cc(target), target, obj);
424-
let target = sysroot_dir.join(obj);
425-
builder.copy(&src, &target);
426-
target_deps.push(target);
427-
}
428-
429429
target_deps
430430
}
431431
}

0 commit comments

Comments
 (0)