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 d913212

Browse files
authoredOct 18, 2019
Rollup merge of rust-lang#65201 - tmiasko:no-bindings, r=rkruppe
Disable Go and OCaml bindings when building LLVM Instead of instaling OCaml bindings in a location where installation will not fail, don't build them in the first place.
2 parents cb41fb6 + 3b0fd82 commit d913212

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed
 

‎src/bootstrap/native.rs

+1-9
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.