Skip to content

Rollup of 8 pull requests #68240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 20 commits into from
Closed

Rollup of 8 pull requests #68240

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d59e9b4
Implement Cursor for linked lists. (RFC 2570).
crlf0710 Jan 11, 2020
091ba6d
Address review comments.
crlf0710 Jan 12, 2020
d2c509a
Address review comments.
crlf0710 Jan 12, 2020
b521491
Fix thumb target CI
jonas-schievink Jan 13, 2020
f37601a
Account for run-make tests in `is_up_to_date`
jonas-schievink Jan 13, 2020
06b9a73
Update APIs according to RFC change suggestions.
crlf0710 Jan 14, 2020
d43615f
Use 3.6 instead of 3.5 in float fract() documentation
SOF3 Jan 14, 2020
9f1452f
Update libssh2-sys to a version that can build for aarch64-pc-windows…
danielframpton Jan 14, 2020
535fc9c
Update iovec to a version with no winapi dependency
danielframpton Jan 14, 2020
9febc2b
Update to a version of cmake with windows arm64 support
danielframpton Jan 14, 2020
7d6271b
Better support for cross compilation on Windows.
danielframpton Jan 10, 2020
106fe0b
Update to a version of compiler_builtins with changes for fixes remai…
danielframpton Jan 14, 2020
8aa2a2c
Rollup merge of #68123 - crlf0710:linked_list_cursor, r=Amanieu
Dylan-DPC Jan 15, 2020
be5bd98
Rollup merge of #68194 - jonas-schievink:fix-thumb-ci, r=alexcrichton
Dylan-DPC Jan 15, 2020
d98dd60
Rollup merge of #68223 - SOF3:float-fract-doc, r=varkor
Dylan-DPC Jan 15, 2020
21bdb78
Rollup merge of #68227 - danielframpton:update-cmake, r=alexcrichton
Dylan-DPC Jan 15, 2020
b45c758
Rollup merge of #68229 - danielframpton:update-iovec, r=alexcrichton
Dylan-DPC Jan 15, 2020
66f7e04
Rollup merge of #68230 - danielframpton:update-libssh2-sys, r=alexcri…
Dylan-DPC Jan 15, 2020
db20048
Rollup merge of #68231 - danielframpton:windows-crosscompile, r=alexc…
Dylan-DPC Jan 15, 2020
e8349bb
Rollup merge of #68233 - danielframpton:update-compiler-builtins, r=a…
Dylan-DPC Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/bootstrap/native.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ impl Step for Llvm {
cfg.define("CMAKE_SYSTEM_NAME", "NetBSD");
} else if target.contains("freebsd") {
cfg.define("CMAKE_SYSTEM_NAME", "FreeBSD");
} else if target.contains("windows") {
cfg.define("CMAKE_SYSTEM_NAME", "Windows");
}

cfg.define("LLVM_NATIVE_BUILD", builder.llvm_out(builder.config.build).join("build"));
Expand Down
10 changes: 6 additions & 4 deletions src/librustc_llvm/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,14 @@ fn main() {
let mut cmd = Command::new(&llvm_config);
cmd.arg(llvm_link_arg).arg("--ldflags");
for lib in output(&mut cmd).split_whitespace() {
if lib.starts_with("-LIBPATH:") {
println!("cargo:rustc-link-search=native={}", &lib[9..]);
} else if is_crossed {
if lib.starts_with("-L") {
if is_crossed {
if lib.starts_with("-LIBPATH:") {
println!("cargo:rustc-link-search=native={}", lib[9..].replace(&host, &target));
} else if lib.starts_with("-L") {
println!("cargo:rustc-link-search=native={}", lib[2..].replace(&host, &target));
}
} else if lib.starts_with("-LIBPATH:") {
println!("cargo:rustc-link-search=native={}", &lib[9..]);
} else if lib.starts_with("-l") {
println!("cargo:rustc-link-lib={}", &lib[2..]);
} else if lib.starts_with("-L") {
Expand Down