diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2022-12-28 15:23:28 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-28 23:59:56 +0000 |
commit | 4323ddb8a139874de77cd39399562168a7e4088f (patch) | |
tree | b739e0ced3dc555a666a96bd583b70cbe4e6046c | |
parent | 510ecb586f50d4b701cd079e8900e016e37eb79e (diff) | |
download | poky-4323ddb8a139874de77cd39399562168a7e4088f.tar.gz |
rust: Move musl-x86 fix for `__stack_chk_fail_local` to rust-source
Any consumer of rust-source (potentially) needs this, so move to
rust-source.inc
(From OE-Core rev: 3c88cf98361a8f1c6f5183cc8887cccfad9d08ba)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/rust/rust-source.inc | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust_1.66.0.bb | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 91a6c5a942..b63e18ac95 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc | |||
@@ -11,3 +11,8 @@ RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" | |||
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" | 12 | UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" |
13 | UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src" | 13 | UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src" |
14 | |||
15 | # see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch | ||
16 | # we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'" | ||
17 | # when building MACHINE=qemux86 for musl | ||
18 | WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" | ||
diff --git a/meta/recipes-devtools/rust/rust_1.66.0.bb b/meta/recipes-devtools/rust/rust_1.66.0.bb index 5192ec2ee1..f1ec769aef 100644 --- a/meta/recipes-devtools/rust/rust_1.66.0.bb +++ b/meta/recipes-devtools/rust/rust_1.66.0.bb | |||
@@ -292,11 +292,6 @@ rust_do_install:class-target() { | |||
292 | rm ${D}${libdir}/rustlib/manifest* | 292 | rm ${D}${libdir}/rustlib/manifest* |
293 | } | 293 | } |
294 | 294 | ||
295 | # see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch | ||
296 | # we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'" | ||
297 | # when building MACHINE=qemux86 for musl | ||
298 | WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" | ||
299 | |||
300 | RUSTLIB_DEP:class-nativesdk = "" | 295 | RUSTLIB_DEP:class-nativesdk = "" |
301 | 296 | ||
302 | # musl builds include libunwind.a | 297 | # musl builds include libunwind.a |