summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes-recipe/rust-common.bbclass4
-rw-r--r--meta/recipes-devtools/rust/rust-source.inc5
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes-recipe/rust-common.bbclass b/meta/classes-recipe/rust-common.bbclass
index e0cedd7aa2..878272721c 100644
--- a/meta/classes-recipe/rust-common.bbclass
+++ b/meta/classes-recipe/rust-common.bbclass
@@ -158,6 +158,10 @@ WRAPPER_TARGET_CXX = "${CXX}"
158WRAPPER_TARGET_CCLD = "${CCLD}" 158WRAPPER_TARGET_CCLD = "${CCLD}"
159WRAPPER_TARGET_LDFLAGS = "${LDFLAGS}" 159WRAPPER_TARGET_LDFLAGS = "${LDFLAGS}"
160WRAPPER_TARGET_EXTRALD = "" 160WRAPPER_TARGET_EXTRALD = ""
161# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
162# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'"
163# when building MACHINE=qemux86 for musl
164WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared"
161WRAPPER_TARGET_AR = "${AR}" 165WRAPPER_TARGET_AR = "${AR}"
162 166
163# compiler is used by gcc-rs 167# compiler is used by gcc-rs
diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc
index fbe2492fb4..a0a788f360 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -16,8 +16,3 @@ export TARGET_VENDOR
16 16
17UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" 17UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html"
18UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src" 18UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src"
19
20# see recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
21# we need to link with ssp_nonshared on musl to avoid "undefined reference to `__stack_chk_fail_local'"
22# when building MACHINE=qemux86 for musl
23WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared"