diff options
| author | John Hodge <tpg@ucc.asn.au> | 2019-10-13 08:37:12 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2019-10-13 08:37:12 +0800 |
| commit | e4385c3ac8fff2f744c4d4a1ac6893e6ac60fadc (patch) | |
| tree | 3141aa022f0ed55a29b4ddf3a4c692321148467a | |
| parent | 784a1e10cf55662ebf1e85834044ac34726f92d9 (diff) | |
| download | mrust-e4385c3ac8fff2f744c4d4a1ac6893e6ac60fadc.tar.gz | |
rustc 1.29 patch - Move hard-coded llvm backend check
| -rw-r--r-- | rustc-1.29.0-src.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/rustc-1.29.0-src.patch b/rustc-1.29.0-src.patch index 417b4294..fb47520c 100644 --- a/rustc-1.29.0-src.patch +++ b/rustc-1.29.0-src.patch @@ -36,10 +36,14 @@ extern crate syntax_pos; +extern crate rustc_codegen_llvm; -@@ -259,2 +260,3 @@ - let backend = match &codegen_name[..] { -+ "llvm" => rustc_codegen_llvm::__rustc_codegen_backend, - "metadata_only" => { +@@ -296,3 +296,7 @@ + } + ++ if backend_name == "llvm" { ++ return rustc_codegen_llvm::__rustc_codegen_backend; ++ } ++ + let target = session::config::host_triple(); # No workspace support in minicargo, patch cargo's Cargo.toml --- src/tools/cargo/Cargo.toml +++ src/tools/cargo/Cargo.toml |