mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 09:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

rust: Move musl-x86 fix for __stack_chk_fail_local to rust-source

Browse 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>
This commit is contained in:
Alex Kiernan
2022-12-28 15:23:28 +00:00
committed by Richard Purdie
parent 510ecb586f
commit 4323ddb8a1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-devtools/rust/rust-source.inc
View File

@@ -11,3 +11,8 @@ RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html"
UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src"
# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'"
# when building MACHINE=qemux86 for musl
WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared"

5
meta/recipes-devtools/rust/rust_1.66.0.bb
View File

@@ -292,11 +292,6 @@ rust_do_install:class-target() {
rm ${D}${libdir}/rustlib/manifest*
}
# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'"
# when building MACHINE=qemux86 for musl
WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared"
RUSTLIB_DEP:class-nativesdk = ""
# musl builds include libunwind.a