diff options
| author | Tyler Mandry <tmandry@gmail.com> | 2019-10-18 13:48:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 13:48:13 -0700 |
| commit | fdef437372ee442ed3792410da237944a2a3cdb9 (patch) | |
| tree | 5354453270e98564c97375abf0320fd65261bb8c | |
| parent | d2bea3c95dc15d7ffb6c0ad650097ae5498b7c14 (diff) | |
| parent | 3b0fd82bfad814ff777e7aa236b74804e4c469c0 (diff) | |
Rollup merge of #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.
| -rw-r--r-- | src/bootstrap/native.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 7bf9ea2688f..fb308bc35eb 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -157,6 +157,7 @@ impl Step for Llvm { .define("WITH_POLLY", "OFF") .define("LLVM_ENABLE_TERMINFO", "OFF") .define("LLVM_ENABLE_LIBEDIT", "OFF") + .define("LLVM_ENABLE_BINDINGS", "OFF") .define("LLVM_ENABLE_Z3_SOLVER", "OFF") .define("LLVM_PARALLEL_COMPILE_JOBS", builder.jobs().to_string()) .define("LLVM_TARGET_ARCH", target.split('-').next().unwrap()) @@ -169,15 +170,6 @@ impl Step for Llvm { } } - // By default, LLVM will automatically find OCaml and, if it finds it, - // install the LLVM bindings in LLVM_OCAML_INSTALL_PATH, which defaults - // to /usr/bin/ocaml. - // This causes problem for non-root builds of Rust. Side-step the issue - // by setting LLVM_OCAML_INSTALL_PATH to a relative path, so it installs - // in the prefix. - cfg.define("LLVM_OCAML_INSTALL_PATH", - env::var_os("LLVM_OCAML_INSTALL_PATH").unwrap_or_else(|| "usr/lib/ocaml".into())); - let want_lldb = builder.config.lldb_enabled && !self.emscripten; // This setting makes the LLVM tools link to the dynamic LLVM library, |