diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-07-17 16:40:54 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-07-17 16:40:54 +0200 |
| commit | c2a9839686c538eb3cf850bb8947ebfe6f28141d (patch) | |
| tree | c57b02417e5dba7b425bdaefc41a96c135ccef0d | |
| parent | 80b9e36709019f98f6bdc33e632641861e470128 (diff) | |
| download | rust-c2a9839686c538eb3cf850bb8947ebfe6f28141d.tar.gz rust-c2a9839686c538eb3cf850bb8947ebfe6f28141d.zip | |
Disable jit and inline-asm when building as part of rustc
Both features are not yet ready. Inline-asm is only supported on Linux and requires explicitly specifying registers instead of register classes. The jit has usability issues and may require the cg_clif executable in the future.
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | build_system/build_backend.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Cargo.toml b/Cargo.toml index 2e34717f419..02098b135f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,8 @@ smallvec = "1.6.1" #gimli = { path = "../" } [features] -default = ["jit", "inline_asm"] +# Enable features not ready to be enabled when compiling as part of rustc +unstable-features = ["jit", "inline_asm"] jit = ["cranelift-jit", "libloading"] inline_asm = [] diff --git a/build_system/build_backend.rs b/build_system/build_backend.rs index 1df2bcc4541..150b6d01a6b 100644 --- a/build_system/build_backend.rs +++ b/build_system/build_backend.rs @@ -4,7 +4,7 @@ use std::process::Command; pub(crate) fn build_backend(channel: &str, host_triple: &str) -> PathBuf { let mut cmd = Command::new("cargo"); - cmd.arg("build").arg("--target").arg(host_triple); + cmd.arg("build").arg("--target").arg(host_triple).arg("--features").arg("unstable-features"); match channel { "debug" => {} |