Skip to content

Commit f3316ab

Browse files
committed
Update the main document with changes to [patch] section
As the libc changes was merged in to the main we do not need to patch it. cc-rs still needs to be patched as compiler/rustc_llvm/Cargo.toml still pins to an old version: cc = "=1.2.16"
1 parent 8176a31 commit f3316ab

1 file changed

Lines changed: 6 additions & 17 deletions

File tree

src/doc/rustc/src/platform-support/aarch64-unknown-linux-pauthtest.md

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -109,29 +109,18 @@ Clang-based toolchain. In this case, no wrapper script is required,
109109

110110
Introduction of `aarch64-unknown-linux-pauthtest` target needs to be propagated
111111
to various crates/repos, so that they can correctly recognise and handle it.
112-
Specifically:
112+
At the time of writing this document the following requires patching:
113113
* `cc-rs`: https://github.com/jchlanda/cc-rs/tree/jakub/cc-v1.2.28-pauthtest
114-
* `libc`: https://github.com/jchlanda/libc/tree/jakub/0.2.183-pauthtest
115114
* `backtrace`: https://github.com/jchlanda/backtrace-rs/tree/jakub/backtrace-v0.3.76-pauthtest
116115

117-
The patched versions of `cc-rs` and `libc` will have to be registered through
118-
`[patch.crates-io]` section of `Cargo.toml` files both in:
119-
`<rust_root>/src/bootstrap/` and `<rust_root>/library/`. Check out `cc-rs` and
120-
`libc` to `<rust_root>/patches` and update config files. See attached diff for
121-
details:
116+
The patched versions of `cc-rs` will have to be registered through
117+
`[patch.crates-io]` section of `Cargo.toml` file in:
118+
`<rust_root>/src/bootstrap/`. Check out `cc-rs` to `<rust_root>/patches` and
119+
update config file. See attached diff for details:
122120

123121
<details>
124122

125123
```diff
126-
diff --git a/library/Cargo.toml b/library/Cargo.toml
127-
index e30e6240942..fb5a12f0065 100644
128-
--- a/library/Cargo.toml
129-
+++ b/library/Cargo.toml
130-
@@ -59,3 +59,4 @@ rustflags = ["-Cpanic=abort"]
131-
rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
132-
rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
133-
rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
134-
+libc = { path = '<rust_root>/patches/libc' }
135124
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
136125
index e1725db60cf..46763cdf9a4 100644
137126
--- a/src/bootstrap/Cargo.toml
@@ -147,7 +136,7 @@ index e1725db60cf..46763cdf9a4 100644
147136

148137
</details>
149138

150-
In contrast to `cc-rs` and `libc`, which are external crates resolved from
139+
In contrast to `cc-rs`, which is an external crate resolved from
151140
[crates.io](https://crates.io/) and can be overridden using `[patch.crates-io]`,
152141
`backtrace` is included in the Rust repository as a git submodule under
153142
`<rust_root>/library/backtrace`. At the time of writing, the necessary change

0 commit comments

Comments
 (0)