Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3623bcc

Browse files
committedOct 18, 2019
Auto merge of #65565 - tmandry:rollup-s8n9bie, r=tmandry
Rollup of 17 pull requests Successful merges: - #65016 (Always inline `mem::{size_of,align_of}` in debug builds) - #65197 (Prepare `MutVisitor`s to handle interned projections) - #65201 (Disable Go and OCaml bindings when building LLVM) - #65364 (Collect occurrences of empty blocks for mismatched braces diagnostic) - #65417 (Add more coherence tests) - #65434 (Add long error explanation for E0577) - #65455 (Avoid unnecessary `TokenTree` to `TokenStream` conversions) - #65472 (Use a sharded dep node to dep node index map) - #65480 (Speed up `LexicalResolve::expansion()`) - #65496 (properly document panics in div_euclid and rem_euclid) - #65508 (add option to ping llvm ice-breakers to triagebot) - #65511 (save-analysis: Nest tables when processing impl block definitions) - #65513 (reorder fmt docs for more clarity) - #65532 (doc: make BitSet intro more short) - #65540 (show up some extra info when t!() fails) - #65549 (Fix left/right shift typo in wrapping rotate docs) - #65552 (Clarify diagnostics when using `~` as a unary op) Failed merges: - #65471 (Add long error explanation for E0578) r? @ghost
2 parents 518deda + 12d1f86 commit 3623bcc

File tree

57 files changed

+1021
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1021
-278
lines changed
 

‎src/bootstrap/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ impl Build {
11261126
}
11271127

11281128
let mut paths = Vec::new();
1129-
let contents = t!(fs::read(stamp));
1129+
let contents = t!(fs::read(stamp), &stamp);
11301130
// This is the method we use for extracting paths from the stamp file passed to us. See
11311131
// run_cargo for more information (in compile.rs).
11321132
for part in contents.split(|b| *b == 0) {

‎src/bootstrap/native.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ impl Step for Llvm {
157157
.define("WITH_POLLY", "OFF")
158158
.define("LLVM_ENABLE_TERMINFO", "OFF")
159159
.define("LLVM_ENABLE_LIBEDIT", "OFF")
160+
.define("LLVM_ENABLE_BINDINGS", "OFF")
160161
.define("LLVM_ENABLE_Z3_SOLVER", "OFF")
161162
.define("LLVM_PARALLEL_COMPILE_JOBS", builder.jobs().to_string())
162163
.define("LLVM_TARGET_ARCH", target.split('-').next().unwrap())
@@ -169,15 +170,6 @@ impl Step for Llvm {
169170
}
170171
}
171172

172-
// By default, LLVM will automatically find OCaml and, if it finds it,
173-
// install the LLVM bindings in LLVM_OCAML_INSTALL_PATH, which defaults
174-
// to /usr/bin/ocaml.
175-
// This causes problem for non-root builds of Rust. Side-step the issue
176-
// by setting LLVM_OCAML_INSTALL_PATH to a relative path, so it installs
177-
// in the prefix.
178-
cfg.define("LLVM_OCAML_INSTALL_PATH",
179-
env::var_os("LLVM_OCAML_INSTALL_PATH").unwrap_or_else(|| "usr/lib/ocaml".into()));
180-
181173
let want_lldb = builder.config.lldb_enabled && !self.emscripten;
182174

183175
// This setting makes the LLVM tools link to the dynamic LLVM library,

0 commit comments

Comments
 (0)
Please sign in to comment.