mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the Cargo submodule

Browse source
This commit is contained in:
Alex Crichton 2018-04-18 08:43:59 -07:00
parent 8830a03043
commit 924f8c7053
3 changed files with 211 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

385
src/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

15
src/bootstrap/cc_detect.rs
View file

@ -79,8 +79,16 @@ pub fn find(build: &mut Build) {
let mut cfg = cc::Build::new();
cfg.cargo_metadata(false).opt_level(2).warnings(false).debug(false)
.target(&target).host(&build.build);
if target.contains("msvc") {
cfg.static_crt(true);
match build.crt_static(target) {
Some(a) => { cfg.static_crt(a); }
None => {
if target.contains("msvc") {
cfg.static_crt(true);
}
if target.contains("musl") {
cfg.static_flag(true);
}
}
}
let config = build.config.target_config.get(&target);
@ -97,8 +105,9 @@ pub fn find(build: &mut Build) {
cc2ar(compiler.path(), &target)
};
build.verbose(&format!("CC_{} = {:?}", &target, compiler.path()));
build.cc.insert(target, compiler);
build.verbose(&format!("CC_{} = {:?}", &target, build.cc(target)));
build.verbose(&format!("CFLAGS_{} = {:?}", &target, build.cflags(target)));
if let Some(ar) = ar {
build.verbose(&format!("AR_{} = {:?}", &target, ar));
build.ar.insert(target, ar);

2
src/tools/cargo

@ -1 +1 @@
Subproject commit 008c3690846798d678f4a0a45ee46cc9ff6dc90f
Subproject commit 5ac4ab14f53fe8210befca9c9178a93f7df70a41