diff options
| author | Jan-Erik Rediger <janerik@fnordig.de> | 2016-08-06 21:13:14 +0200 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2016-09-30 14:02:41 -0700 |
| commit | cb3f5799f4c1e5786eb3976dfa33f527a0415168 (patch) | |
| tree | 2249f57e1f4ef6cbfe4c1226d0f60392ff843984 | |
| parent | 939bd4733977a0c88f9c3b131d486b5ffc6007b1 (diff) | |
| download | rust-cb3f5799f4c1e5786eb3976dfa33f527a0415168.tar.gz rust-cb3f5799f4c1e5786eb3976dfa33f527a0415168.zip | |
Make the jsbackend an optional component
| -rw-r--r-- | mk/main.mk | 2 | ||||
| -rw-r--r-- | src/librustc_llvm/build.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/main.mk b/mk/main.mk index cc843add50d..e68a8f30055 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -300,7 +300,7 @@ endif # LLVM macros ###################################################################### -LLVM_OPTIONAL_COMPONENTS=x86 arm aarch64 mips powerpc pnacl systemz +LLVM_OPTIONAL_COMPONENTS=x86 arm aarch64 mips powerpc pnacl systemz jsbackend LLVM_REQUIRED_COMPONENTS=ipo bitreader bitwriter linker asmparser mcjit \ interpreter instrumentation diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index 3f551476e2b..c805fd7c7b6 100644 --- a/src/librustc_llvm/build.rs +++ b/src/librustc_llvm/build.rs @@ -66,7 +66,7 @@ fn main() { let host = env::var("HOST").expect("HOST was not set"); let is_crossed = target != host; - let optional_components = ["x86", "arm", "aarch64", "mips", "powerpc", "pnacl", "systemz"]; + let optional_components = ["x86", "arm", "aarch64", "mips", "powerpc", "pnacl", "systemz", "jsbackend"]; // FIXME: surely we don't need all these components, right? Stuff like mcjit // or interpreter the compiler itself never uses. |