diff options
-rw-r--r-- | meta/classes-recipe/rust-common.bbclass | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust-source.inc | 5 |
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}" | |||
158 | WRAPPER_TARGET_CCLD = "${CCLD}" | 158 | WRAPPER_TARGET_CCLD = "${CCLD}" |
159 | WRAPPER_TARGET_LDFLAGS = "${LDFLAGS}" | 159 | WRAPPER_TARGET_LDFLAGS = "${LDFLAGS}" |
160 | WRAPPER_TARGET_EXTRALD = "" | 160 | WRAPPER_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 | ||
164 | WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" | ||
161 | WRAPPER_TARGET_AR = "${AR}" | 165 | WRAPPER_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 | ||
17 | UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" | 17 | UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" |
18 | UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src" | 18 | UPSTREAM_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 | ||
23 | WRAPPER_TARGET_EXTRALD:libc-musl = "-lssp_nonshared" | ||