|
| 1 | +From f03dda9ba9e2523b24ae66a5ef8b20f9630f970c Mon Sep 17 00:00:00 2001 |
| 2 | +From: Ben Cressey < [email protected]> |
| 3 | +Date: Sat, 22 Feb 2025 21:53:58 +0000 |
| 4 | +Subject: [PATCH] add targets to vendored cc-rs crate |
| 5 | + |
| 6 | +cc-rs now requires targets to appear in a generated list of targets, |
| 7 | +which causes rustc bootstrap to fail for our custom targets. |
| 8 | + |
| 9 | +Signed-off-by: Ben Cressey < [email protected]> |
| 10 | +--- |
| 11 | + vendor/cc-1.2.0/.cargo-checksum.json | 2 +- |
| 12 | + vendor/cc-1.2.0/src/target/generated.rs | 48 +++++++++++++++++++++++++ |
| 13 | + 2 files changed, 49 insertions(+), 1 deletion(-) |
| 14 | + |
| 15 | +diff --git a/vendor/cc-1.2.0/.cargo-checksum.json b/vendor/cc-1.2.0/.cargo-checksum.json |
| 16 | +index 54c3a79d8..7391355f1 100644 |
| 17 | +--- a/vendor/cc-1.2.0/.cargo-checksum.json |
| 18 | ++++ b/vendor/cc-1.2.0/.cargo-checksum.json |
| 19 | +@@ -1 +1 @@ |
| 20 | +-{"files":{"CHANGELOG.md":"fb0a3bcb34301d2578bef86feabe93057068cb1906a7f10b584f58ff6123e8c6","Cargo.lock":"b661254fadca74408d53742755b371f7ae29e501e851aeae13bcd14a51883321","Cargo.toml":"50debe1b2fc050e8b305bdd514509d98cdbc59e96e5f10888df4b6fca19d3a75","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","clippy.toml":"aa7850db4350883c8f373bd0d6b4d19bf3b75f13c1c238e24368c109cb52fb1d","src/command_helpers.rs":"b766a70e39b8ea7bb57afd288bcac205a23f6a26ac5619cb1d5b10f70c5dfdea","src/detect_compiler_family.c":"97ca4b021495611e828becea6187add37414186a16dfedd26c2947cbce6e8b2f","src/lib.rs":"221ba9475100303b5c694b2a02e5353452ee08a29e4e4d4d67ea8fcbd87605df","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"018a01cb00182270bbcb68e31e7a7c5c621a95f086e4c68cfa2bf557ac24e5f2","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"74384d41198740a6fce0877f144262db09fb091225fa8fbfa771314bb11487c6","src/target.rs":"7313240db078ad85c1209a42a5fa96c3692b5d6e5093c7f366a1b99677247109","src/target/apple.rs":"6afbecac9f66aa72db55694413532f80b2753f28466a6213d1aa901a03c78bcd","src/target/generated.rs":"af067e1c291e895ddb591f92534eed0c48977cdb2b58f8239423e07c6de31cd3","src/target/llvm.rs":"e1db4a7fb8b905ee9853781f2fcc64a9d3b48154e4c8b6cb12f5373c5935da6e","src/target/parser.rs":"4f2129a24273d62bf8ab339098e7f758e4e42b0df369dd2b0eb1b20726be91f8","src/tempfile.rs":"ebafb5b0e5d08b0706916ed911d4245240e60c3e2d0c9a1630c520842988a2b3","src/tool.rs":"2e6550062e021f2b394388172bbb01e86fe6a94d2395bcb3c85a9e86690da1a9","src/utilities.rs":"52b30b24a1c31cdefb105309ee5220cfc9fca76eaf4e6d6509c3e19f431448fe","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"0ff410bd71f08ee88e99609c15be5f1bc16ad7bd07a83918d13a70c8465642e2","src/windows/mod.rs":"34cfa201cfbcac7ccaa3ea5295d3e4200439af3cc5c6433baf81502596040a89","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"946527cf8fd32c3472f6a2884dcdec290763101097334c7478f9c24c3950db6b","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"e2714c8307bfa083b9745eb0e46cadd7f98d7b88abf45a7637172019324e34b8","src/windows/windows_targets.rs":"5b4648ebc22b028caca9f4b4bf8881fe2d094b7bec217264ba2e6e2c49d1ccee"},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} |
| 21 | +\ No newline at end of file |
| 22 | ++{"files":{},"package":"1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"} |
| 23 | +\ No newline at end of file |
| 24 | +diff --git a/vendor/cc-1.2.0/src/target/generated.rs b/vendor/cc-1.2.0/src/target/generated.rs |
| 25 | +index 0c9b0ae1a..ce95772da 100644 |
| 26 | +--- a/vendor/cc-1.2.0/src/target/generated.rs |
| 27 | ++++ b/vendor/cc-1.2.0/src/target/generated.rs |
| 28 | +@@ -124,6 +124,30 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[ |
| 29 | + unversioned_llvm_target: "arm64-apple-watchos-simulator", |
| 30 | + }, |
| 31 | + ), |
| 32 | ++ ( |
| 33 | ++ "aarch64-bottlerocket-linux-gnu", |
| 34 | ++ TargetInfo { |
| 35 | ++ full_arch: "aarch64", |
| 36 | ++ arch: "aarch64", |
| 37 | ++ vendor: "bottlerocket", |
| 38 | ++ os: "linux", |
| 39 | ++ env: "gnu", |
| 40 | ++ abi: "", |
| 41 | ++ unversioned_llvm_target: "aarch64-unknown-linux-gnu", |
| 42 | ++ }, |
| 43 | ++ ), |
| 44 | ++ ( |
| 45 | ++ "aarch64-bottlerocket-linux-musl", |
| 46 | ++ TargetInfo { |
| 47 | ++ full_arch: "aarch64", |
| 48 | ++ arch: "aarch64", |
| 49 | ++ vendor: "bottlerocket", |
| 50 | ++ os: "linux", |
| 51 | ++ env: "musl", |
| 52 | ++ abi: "", |
| 53 | ++ unversioned_llvm_target: "aarch64-unknown-linux-musl", |
| 54 | ++ }, |
| 55 | ++ ), |
| 56 | + ( |
| 57 | + "aarch64-fuchsia", |
| 58 | + TargetInfo { |
| 59 | +@@ -2848,6 +2872,30 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[ |
| 60 | + unversioned_llvm_target: "x86_64-apple-watchos-simulator", |
| 61 | + }, |
| 62 | + ), |
| 63 | ++ ( |
| 64 | ++ "x86_64-bottlerocket-linux-gnu", |
| 65 | ++ TargetInfo { |
| 66 | ++ full_arch: "x86_64", |
| 67 | ++ arch: "x86_64", |
| 68 | ++ vendor: "bottlerocket", |
| 69 | ++ os: "linux", |
| 70 | ++ env: "gnu", |
| 71 | ++ abi: "", |
| 72 | ++ unversioned_llvm_target: "x86_64-unknown-linux-gnu", |
| 73 | ++ }, |
| 74 | ++ ), |
| 75 | ++ ( |
| 76 | ++ "x86_64-bottlerocket-linux-musl", |
| 77 | ++ TargetInfo { |
| 78 | ++ full_arch: "x86_64", |
| 79 | ++ arch: "x86_64", |
| 80 | ++ vendor: "bottlerocket", |
| 81 | ++ os: "linux", |
| 82 | ++ env: "musl", |
| 83 | ++ abi: "", |
| 84 | ++ unversioned_llvm_target: "x86_64-unknown-linux-musl", |
| 85 | ++ }, |
| 86 | ++ ), |
| 87 | + ( |
| 88 | + "x86_64-fortanix-unknown-sgx", |
| 89 | + TargetInfo { |
| 90 | +-- |
| 91 | +2.47.0 |
| 92 | + |
0 commit comments