openwrt

Commit Graph

Author	SHA1	Message	Date
Daniel Golle	a1788e6156	tools/sccache: add sccache Rust compiler cache RUST_SCCACHE builds sccache 0.18.0 from a vendor tarball and makes it the RUSTC_WRAPPER of the cargo builds of host tools, target packages and libstd-rust. For target packages, scripts/rust-target-wrapper.sh runs it in turn. The option sits next to CCACHE and is available with any Rust toolchain of the build system. The packages feed defines RUST_SCCACHE as well, without a dependency, and Kconfig merges both definitions, so the tools and the cargo variables check for a Rust toolchain once more. sccache is built without default features: the local disk cache stays, the remote storage backends and their HTTP and TLS stacks are left out, so the build needs no host library. sccache needs rustc to build, so the rustc build from source and the sccache build run unwrapped. sccache keeps its cache and configuration in $(TOPDIR)/.sccache, or in RUST_SCCACHE_DIR when set, and its server listens on a socket in $(TMP_DIR), so that each tree has a server of its own. distclean removes .sccache, and the SCCACHE_* variables of the environment are unexported. Signed-off-by: Daniel Golle <daniel@makrotopia.org>	2026-10-30 12:06:08 +02:00
Daniel Golle	32f1c26eb6	build: add Rust package build helpers Add rust-package.mk for target packages written in Rust. The Cargo environment carries the target triple, CPU flags, the C and C++ flags for cc-rs, the linker and the ABI-specific sysroot of libstd-rust, while native build scripts and proc macros keep the host sysroot and linker. Builds run in the crate's working directory with an explicit target and offline from the vendor tarball; with a source tree override (git-src, USE_SOURCE_DIR), which has none, Cargo fetches the locked crates. Target packages depend on libstd-rust at build time and track its configuration inputs for rebuilds. rustc runs the linker with arguments of its own, without TARGET_LDFLAGS. The linker selection and the -z options that hardening.mk and package.mk set for every package are passed to rustc, for packages and for libstd-rust. When the target triple is the build host's, cc-rs takes the host compiler for target C code as well. For that triple the C and C++ compiler of cc-rs is scripts/rust-cc-wrapper.sh, linked into $(STAGING_DIR_HOST)/bin by tools/rust. It runs the target compiler with the target flags for build scripts whose OUT_DIR lies in the target triple's directory, and the host compiler for the others. RUST_PREFER_DYNAMIC is available with any Rust toolchain, controls the default userspace standard-library linkage and defaults to shared linking. Packages can override it. Release builds use LTO either way; rustc runs LTO next to -Cprefer-dynamic only with the unstable -Zdylib-lto. RUST_PKG_DEPENDS carries the architecture dependencies and, with shared linking, the libstd-rust runtime dependency. For packages that keep the default, that dependency is conditional on RUST_PREFER_DYNAMIC, as .config is not read while package metadata is collected. Release builds emit no unwind tables and take the size options of unstable rustc that libstd-rust is built with: panics without location, derived Debug output reduced to type names and, with RUST_PANIC_IMMEDIATE_ABORT, -Cpanic=immediate-abort. Permitting unstable options for every crate with RUSTC_BOOTSTRAP=1 changes the code of dependencies: the build scripts of anyhow, thiserror and proc-macro2 then detect unstable features and use them. scripts/rust-target-wrapper.sh, the RUSTC_WRAPPER of package builds, adds the options, and -Zdylib-lto with a shared libstd, only to the target crates cargo compiles, recognised by --target, -C metadata and --error-format=json, and permits unstable options for that crate alone. Build scripts and their probes see neither. A package keeps panic locations with RUST_PKG_LOCATION_DETAIL:=1 and selects the Debug output with RUST_PKG_FMT_DEBUG. None of this applies with CONFIG_DEBUG. Packages build the release profile, as maturin, CMake and autotools projects do, and CONFIG_DEBUG gives it the settings of the dev profile, ahead of the profile settings of the package. Build paths are mapped out of packages as out of libstd-rust. Without a Rust toolchain of the build system, Rust packages build with rust/host of the packages feed, which installs to $(STAGING_DIR)/host, so that packages can move from the Rust support of the packages feed one at a time. RUSTC and CARGO point there, there is neither a sysroot of libstd-rust nor a shared libstd, the mips64 triples are those its std is built for, and on the build host's triple the target linker is set through the Cargo variable. The build dependencies, on libstd-rust or rust/host, follow USE_RUST_TOOLCHAIN in the package metadata, also for host builds through rust-host-build.mk. After a switch from None to a Rust toolchain, the cargo of rust/host still comes first in PATH, so the help of the toolchain choice names its clean-up. The file is derived from lang/rust in the packages feed by Luca Barbato and Donald Hoskins. Reported-by: Andre Heider <a.heider@gmail.com> Co-developed-by: Brian Redbeard <redbeard@dead-city.org> Signed-off-by: Brian Redbeard <redbeard@dead-city.org> Co-developed-by: Aditya Nugraha <vortexilation@gmail.com> Signed-off-by: Aditya Nugraha <vortexilation@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>	2026-10-30 12:06:08 +02:00
Daniel Golle	db310ff0fb	libstd-rust: build and package the Rust standard library Build the sysroot crate with the selected Cargo and rustc, using the source tarball's vendored crates and shared target CPU flags. Stage the rlibs and shared library through normal package-owned target staging, and include that sysroot in the SDK. Separate Cargo output by ABI identity to keep dependency artefacts from different configurations in their own build directories. Name the shared library and package ABI from compiler, source, target and build configuration inputs, with configuration changes triggering a rebuild. Declare libgcc as a runtime dependency for libgcc_s.so.1. Release builds optimise for size, abort on panic and emit no unwind tables. They also take the size options of unstable rustc, which the sysroot build permits anyway: panics carry no location (-Zlocation-detail=none) and derived Debug output is reduced to type names (-Zfmt-debug=shallow). RUST_PANIC_IMMEDIATE_ABORT, on by default, builds with -Cpanic=immediate-abort and without the panic-unwind feature: a panic stops the program at once, without formatting a message. rustc requires the same panic strategy for all crates of a program, the standard library included, so this is a build-wide option. Debug builds retain unwinding, panic messages and full Debug output. Build paths are mapped out of the library as iremap in rules.mk does for C, unless CONFIG_DEBUG is set without CONFIG_REPRODUCIBLE_DEBUG_INFO. The map stays out of the inputs of the ABI identity, which would otherwise depend on the build path. rust-values.mk maps the OpenWrt target to its Rust target triple and CPU flags; the mapping is derived from lang/rust in the packages feed by Luca Barbato and Donald Hoskins. The mips64 ABI comes from CONFIG_MIPS64_ABI, which every mips64 configuration sets, and n64 maps to the muslabi64 and gnuabi64 triples. These are hard-float, so soft-float mips64 with musl uses mips64-openwrt-linux-musl, the soft-float n64 target of rustc, and the other soft-float mips64 and mips64el configurations, which have no Rust target, get no Rust packages. The e500v2 of mpc85xx has no FPU but shares the hard-float powerpc triple, whose hard-float feature is turned off with CONFIG_SOFT_FLOAT. When the target triple is the build host's, as for x86_64 and aarch64 glibc targets, Cargo links build scripts with the target linker as well but keeps target rustflags off them, so the target linker is passed as a rustflag in that case. include/scan.mk rescans the package metadata when an include/rust-.mk file changes, as for include/package.mk. Co-developed-by: Brian Redbeard <redbeard@dead-city.org> Signed-off-by: Brian Redbeard <redbeard@dead-city.org> Co-developed-by: Aditya Nugraha <vortexilation@gmail.com> Signed-off-by: Aditya Nugraha <vortexilation@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>	2026-10-30 12:06:08 +02:00

Author

SHA1

Message

Date

Daniel Golle

a1788e6156

tools/sccache: add sccache Rust compiler cache

RUST_SCCACHE builds sccache 0.18.0 from a vendor tarball and makes it
the RUSTC_WRAPPER of the cargo builds of host tools, target packages
and libstd-rust. For target packages, scripts/rust-target-wrapper.sh
runs it in turn. The option sits next to CCACHE and is available with
any Rust toolchain of the build system. The packages feed defines
RUST_SCCACHE as well, without a dependency, and Kconfig merges both
definitions, so the tools and the cargo variables check for a Rust
toolchain once more.

sccache is built without default features: the local disk cache stays,
the remote storage backends and their HTTP and TLS stacks are left out,
so the build needs no host library. sccache needs rustc to build, so
the rustc build from source and the sccache build run unwrapped.

sccache keeps its cache and configuration in $(TOPDIR)/.sccache, or in
RUST_SCCACHE_DIR when set, and its server listens on a socket in
$(TMP_DIR), so that each tree has a server of its own. distclean
removes .sccache, and the SCCACHE_* variables of the environment are
unexported.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

2026-10-30 12:06:08 +02:00

Daniel Golle

32f1c26eb6

build: add Rust package build helpers

Add rust-package.mk for target packages written in Rust. The Cargo
environment carries the target triple, CPU flags, the C and C++ flags
for cc-rs, the linker and the ABI-specific sysroot of libstd-rust,
while native build scripts and proc macros keep the host sysroot and
linker. Builds run in the crate's working directory with an explicit
target and offline from the vendor tarball; with a source tree override
(git-src, USE_SOURCE_DIR), which has none, Cargo fetches the locked
crates. Target packages depend on libstd-rust at build time and track
its configuration inputs for rebuilds.

rustc runs the linker with arguments of its own, without TARGET_LDFLAGS.
The linker selection and the -z options that hardening.mk and
package.mk set for every package are passed to rustc, for packages and
for libstd-rust.

When the target triple is the build host's, cc-rs takes the host
compiler for target C code as well. For that triple the C and C++
compiler of cc-rs is scripts/rust-cc-wrapper.sh, linked into
$(STAGING_DIR_HOST)/bin by tools/rust. It runs the target compiler with
the target flags for build scripts whose OUT_DIR lies in the target
triple's directory, and the host compiler for the others.

RUST_PREFER_DYNAMIC is available with any Rust toolchain, controls the
default userspace standard-library linkage and defaults to shared
linking. Packages can override it. Release builds use LTO either way;
rustc runs LTO next to -Cprefer-dynamic only with the unstable
-Zdylib-lto. RUST_PKG_DEPENDS carries the architecture dependencies
and, with shared linking, the libstd-rust runtime dependency. For
packages that keep the default, that dependency is conditional on
RUST_PREFER_DYNAMIC, as .config is not read while package metadata is
collected.

Release builds emit no unwind tables and take the size options of
unstable rustc that libstd-rust is built with: panics without location,
derived Debug output reduced to type names and, with
RUST_PANIC_IMMEDIATE_ABORT, -Cpanic=immediate-abort. Permitting unstable
options for every crate with RUSTC_BOOTSTRAP=1 changes the code of
dependencies: the build scripts of anyhow, thiserror and proc-macro2
then detect unstable features and use them.
scripts/rust-target-wrapper.sh, the RUSTC_WRAPPER of package builds,
adds the options, and -Zdylib-lto with a shared libstd, only to the
target crates cargo compiles, recognised by --target, -C metadata and
--error-format=json, and permits unstable options for that crate alone.
Build scripts and their probes see neither. A package keeps panic
locations with RUST_PKG_LOCATION_DETAIL:=1 and selects the Debug output
with RUST_PKG_FMT_DEBUG. None of this applies with CONFIG_DEBUG.
Packages build the release profile, as maturin, CMake and autotools
projects do, and CONFIG_DEBUG gives it the settings of the dev profile,
ahead of the profile settings of the package. Build paths are mapped out
of packages as out of libstd-rust.

Without a Rust toolchain of the build system, Rust packages build with
rust/host of the packages feed, which installs to $(STAGING_DIR)/host,
so that packages can move from the Rust support of the packages feed
one at a time. RUSTC and CARGO point there, there is neither a sysroot
of libstd-rust nor a shared libstd, the mips64 triples are those its
std is built for, and on the build host's triple the target linker is
set through the Cargo variable. The build dependencies, on libstd-rust
or rust/host, follow USE_RUST_TOOLCHAIN in the package metadata, also
for host builds through rust-host-build.mk. After a switch from None to
a Rust toolchain, the cargo of rust/host still comes first in PATH, so
the help of the toolchain choice names its clean-up.

The file is derived from lang/rust in the packages feed by Luca Barbato
and Donald Hoskins.

Reported-by: Andre Heider <a.heider@gmail.com>
Co-developed-by: Brian Redbeard <redbeard@dead-city.org>
Signed-off-by: Brian Redbeard <redbeard@dead-city.org>
Co-developed-by: Aditya Nugraha <vortexilation@gmail.com>
Signed-off-by: Aditya Nugraha <vortexilation@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

2026-10-30 12:06:08 +02:00

Daniel Golle

db310ff0fb

libstd-rust: build and package the Rust standard library

Build the sysroot crate with the selected Cargo and rustc, using the
source tarball's vendored crates and shared target CPU flags. Stage the
rlibs and shared library through normal package-owned target staging,
and include that sysroot in the SDK.
Separate Cargo output by ABI identity to keep dependency artefacts from
different configurations in their own build directories.

Name the shared library and package ABI from compiler, source, target
and build configuration inputs, with configuration changes triggering
a rebuild. Declare libgcc as a runtime dependency for libgcc_s.so.1.

Release builds optimise for size, abort on panic and emit no unwind
tables. They also take the size options of unstable rustc, which the
sysroot build permits anyway: panics carry no location
(-Zlocation-detail=none) and derived Debug output is reduced to type
names (-Zfmt-debug=shallow). RUST_PANIC_IMMEDIATE_ABORT, on by default,
builds with -Cpanic=immediate-abort and without the panic-unwind
feature: a panic stops the program at once, without formatting a
message. rustc requires the same panic strategy for all crates of a
program, the standard library included, so this is a build-wide option.
Debug builds retain unwinding, panic messages and full Debug output.

Build paths are mapped out of the library as iremap in rules.mk does
for C, unless CONFIG_DEBUG is set without
CONFIG_REPRODUCIBLE_DEBUG_INFO. The map stays out of the inputs of the
ABI identity, which would otherwise depend on the build path.

rust-values.mk maps the OpenWrt target to its Rust target triple and CPU
flags; the mapping is derived from lang/rust in the packages feed by
Luca Barbato and Donald Hoskins. The mips64 ABI comes from
CONFIG_MIPS64_ABI, which every mips64 configuration sets, and n64 maps
to the muslabi64 and gnuabi64 triples. These are hard-float, so
soft-float mips64 with musl uses mips64-openwrt-linux-musl, the
soft-float n64 target of rustc, and the other soft-float mips64 and
mips64el configurations, which have no Rust target, get no Rust
packages. The e500v2 of mpc85xx has no FPU but shares the hard-float
powerpc triple, whose hard-float feature is turned off with
CONFIG_SOFT_FLOAT. When the target triple is the build host's, as for
x86_64 and aarch64 glibc targets, Cargo links build scripts with the
target linker as well but keeps target rustflags off them, so the target
linker is passed as a rustflag in that case.

include/scan.mk rescans the package metadata when an include/rust-*.mk
file changes, as for include/package*.mk.

Co-developed-by: Brian Redbeard <redbeard@dead-city.org>
Signed-off-by: Brian Redbeard <redbeard@dead-city.org>
Co-developed-by: Aditya Nugraha <vortexilation@gmail.com>
Signed-off-by: Aditya Nugraha <vortexilation@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

2026-10-30 12:06:08 +02:00

3 Commits (master)