summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2017-10-05 05:01:02 +0200
committerest31 <MTest31@outlook.com>2017-10-05 05:01:02 +0200
commit6f7dd654cdf5aeec714914ec0848fb711662fa11 (patch)
tree12655ba682f6a932e7ebd0e837771acfb5b99d13
parentd7e73e4b1abe120520d1894b89c0e25469f41e69 (diff)
downloadrust-6f7dd654cdf5aeec714914ec0848fb711662fa11.tar.gz
Remove nacl from librustc_llvm
-rw-r--r--src/librustc_llvm/build.rs2
-rw-r--r--src/librustc_llvm/lib.rs4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
index dde7a38efc7..12d57e78c69 100644
--- a/src/librustc_llvm/build.rs
+++ b/src/librustc_llvm/build.rs
@@ -88,7 +88,7 @@ fn main() {
let is_crossed = target != host;
let mut optional_components =
- vec!["x86", "arm", "aarch64", "mips", "powerpc", "pnacl",
+ vec!["x86", "arm", "aarch64", "mips", "powerpc",
"systemz", "jsbackend", "webassembly", "msp430", "sparc", "nvptx"];
let mut version_cmd = Command::new(&llvm_config);
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs
index 9be5f5b5486..98172bca177 100644
--- a/src/librustc_llvm/lib.rs
+++ b/src/librustc_llvm/lib.rs
@@ -346,10 +346,6 @@ pub fn initialize_available_targets() {
LLVMInitializePowerPCTargetMC,
LLVMInitializePowerPCAsmPrinter,
LLVMInitializePowerPCAsmParser);
- init_target!(llvm_component = "pnacl",
- LLVMInitializePNaClTargetInfo,
- LLVMInitializePNaClTarget,
- LLVMInitializePNaClTargetMC);
init_target!(llvm_component = "systemz",
LLVMInitializeSystemZTargetInfo,
LLVMInitializeSystemZTarget,