From 9cb948feea23e18d26f2457e8f672c36e4f91e5d Mon Sep 17 00:00:00 2001 From: Sam Elliott Date: Fri, 2 Aug 2019 17:05:59 +0100 Subject: [PATCH] rustbuild: WebAssembly is no longer an experimental LLVM backend --- config.toml.example | 7 +++---- src/bootstrap/native.rs | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config.toml.example b/config.toml.example index a1917031e4e..6816eaeaa94 100644 --- a/config.toml.example +++ b/config.toml.example @@ -57,14 +57,13 @@ # support. You'll need to write a target specification at least, and most # likely, teach rustc about the C ABI of the target. Get in touch with the # Rust team and file an issue if you need assistance in porting! -#targets = "AArch64;ARM;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;Sparc;SystemZ;X86" +#targets = "AArch64;ARM;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;Sparc;SystemZ;WebAssembly;X86" # LLVM experimental targets to build support for. These targets are specified in # the same format as above, but since these targets are experimental, they are # not built by default and the experimental Rust compilation targets that depend -# on them will not work unless the user opts in to building them. By default the -# `WebAssembly` target is enabled when compiling LLVM from scratch. -#experimental-targets = "WebAssembly" +# on them will not work unless the user opts in to building them. +#experimental-targets = "" # Cap the number of parallel linker invocations when compiling LLVM. # This can be useful when building LLVM with debug info, which significantly diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 9405ae4b155..174e4638aac 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -125,7 +125,7 @@ impl Step for Llvm { } else { match builder.config.llvm_targets { Some(ref s) => s, - None => "AArch64;ARM;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;Sparc;SystemZ;X86", + None => "AArch64;ARM;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;Sparc;SystemZ;WebAssembly;X86", } }; @@ -134,7 +134,7 @@ impl Step for Llvm { } else { match builder.config.llvm_experimental_targets { Some(ref s) => s, - None => "WebAssembly", + None => "", } };