diff options
| -rw-r--r-- | meta/classes-recipe/rust-common.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/rust/rust_1.90.0.bb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes-recipe/rust-common.bbclass b/meta/classes-recipe/rust-common.bbclass index 31331c7a26..d9f7a7a932 100644 --- a/meta/classes-recipe/rust-common.bbclass +++ b/meta/classes-recipe/rust-common.bbclass | |||
| @@ -149,7 +149,7 @@ create_wrapper_rust () { | |||
| 149 | binary = orig_binary.split()[0] | 149 | binary = orig_binary.split()[0] |
| 150 | args = orig_binary.split() + sys.argv[1:] | 150 | args = orig_binary.split() + sys.argv[1:] |
| 151 | if extras: | 151 | if extras: |
| 152 | args.append(extras) | 152 | args.extend(extras.split()) |
| 153 | os.execvp(binary, args) | 153 | os.execvp(binary, args) |
| 154 | EOF | 154 | EOF |
| 155 | chmod +x "${file}" | 155 | chmod +x "${file}" |
diff --git a/meta/recipes-devtools/rust/rust_1.90.0.bb b/meta/recipes-devtools/rust/rust_1.90.0.bb index e7f3985332..50b19267fe 100644 --- a/meta/recipes-devtools/rust/rust_1.90.0.bb +++ b/meta/recipes-devtools/rust/rust_1.90.0.bb | |||
| @@ -69,6 +69,11 @@ do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot" | |||
| 69 | do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER" | 69 | do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER" |
| 70 | do_rust_setup_snapshot[depends] += "patchelf-native:do_populate_sysroot" | 70 | do_rust_setup_snapshot[depends] += "patchelf-native:do_populate_sysroot" |
| 71 | 71 | ||
| 72 | # Pass zlib/zstd link flags to the target linker wrapper via WRAPPER_TARGET_EXTRALD. | ||
| 73 | # This ensures LLVM-using components (like rustc_codegen_llvm) can find compression libraries. | ||
| 74 | # The wrapper will split this into separate arguments automatically. | ||
| 75 | WRAPPER_TARGET_EXTRALD:append:class-target = " -lz -lzstd" | ||
| 76 | |||
| 72 | RUSTC_BOOTSTRAP = "${STAGING_BINDIR_NATIVE}/rustc" | 77 | RUSTC_BOOTSTRAP = "${STAGING_BINDIR_NATIVE}/rustc" |
| 73 | CARGO_BOOTSTRAP = "${STAGING_BINDIR_NATIVE}/cargo" | 78 | CARGO_BOOTSTRAP = "${STAGING_BINDIR_NATIVE}/cargo" |
| 74 | RUSTC_BOOTSTRAP:class-native = "${WORKDIR}/rust-snapshot/bin/rustc" | 79 | RUSTC_BOOTSTRAP:class-native = "${WORKDIR}/rust-snapshot/bin/rustc" |
