Move copying of MinGW CRT to the better location

This commit is contained in:
Mateusz Mikuła 2020-06-02 23:18:41 +02:00
parent 9ceb9bb203
commit 638ebbc585

View file

@ -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
}
}