Skip to content

Commit 1307dd7

Browse files
authored
Avoid nightly regression by using older nightly (#338)
nightly-2023-12-15 breaks compilation of native applets by having symbols from `compiler_builtins` conflict between the applet static library and the platform during linking. This was not the case with nightly-2023-11-14. This rollback is temporary until rust-lang/rust#118609 is fixed or provides guidance on how to address this issue. Currently the only work-arounds are: - Compile the applet to an object file (like `applet.o`) and let the platform link all the dependencies of the applet. This is not obvious to do generically at the moment. - Require applets that need to compile natively to directly depend on `compiler_builtins` with the `weak-intrinsics` feature. If the dependency could been indirect, the prelude would have been the perfect place to introduce it. But given the dependency must be direct, this adds a small burden on applets.
1 parent f6711f2 commit 1307dd7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

crates/prelude/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@
113113

114114
## 0.1.0
115115

116-
<!-- Increment to skip CHANGELOG.md test: 19 -->
116+
<!-- Increment to skip CHANGELOG.md test: 20 -->

crates/prelude/src/callback.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ macro_rules! define {
2020
(#[$m:meta] $n:ident $(, $x:ident)*) => {
2121
#[$m] #[no_mangle]
2222
extern "C" fn $n (
23-
ptr: extern "C" fn(*const u8 $(, usize ${ignore($x)})*),
23+
ptr: extern "C" fn(*const u8 $(, usize ${ignore(x)})*),
2424
this: *const u8 $(, $x: usize)*
2525
) {
2626
ptr(this $(, $x)*);

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2023-12-15"
2+
channel = "nightly-2023-11-14"
33
components = ["clippy", "llvm-tools", "rust-src", "rustfmt"]
44
targets = [
55
"i686-unknown-linux-gnu",

0 commit comments

Comments
 (0)