vasilito
5098d1651f
Reverts the prior session's -Z json-target-spec addition
that was breaking the build on nightly-2025-10-03 (the
kernel's rust-toolchain.toml specified toolchain). The
flag did not exist in that nightly; only nightly-2026-04-11
has it. Since the prior toolchain can build custom .json
target specs without any cargo-level gating (just pass
-Zunstable-options through -- separator to rustc),
the cleanest fix is to use rustc's -- directly:
cd SOURCE && cargo rustc -Z build-std=core,alloc ...
--bin kernel --target FILE --release
-- -C link-arg=...
RUSTUP_TOOLCHAIN=nightly-2025-10-03 is explicit so the
Makefile build works regardless of which toolchain the
outer shell has.
Also: restore rust-toolchain.toml to nightly-2025-10-03
(the version pinned in this fork). The 2026-04-01 bump
was a workaround attempt that did not work.
And: add .cargo/config.toml with [unstable]
json-target-spec = true as the new standard way (cargo
PR #16557) of enabling custom .json target specs. This
is harmless on older toolchains that don't have the feature
(cargo ignores unknown config keys).
Discovered via research into the nightly-2026-04-11 vs
nightly-2025-10-03 divergence after the redbear-mini build
failed with 'unknown -Z flag specified: json-target-spec'.
67 lines
1.7 KiB
Makefile
67 lines
1.7 KiB
Makefile
.PHONY: all check
|
|
|
|
SOURCE:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
|
|
BUILD?=$(CURDIR)
|
|
export RUST_TARGET_PATH=$(SOURCE)/targets
|
|
|
|
ifeq ($(TARGET),)
|
|
ARCH?=$(shell uname -m)
|
|
else
|
|
ARCH?=$(shell echo "$(TARGET)" | cut -d - -f1)
|
|
endif
|
|
|
|
ifeq ($(ARCH),riscv64gc)
|
|
override ARCH:=riscv64
|
|
GNU_TARGET=riscv64-unknown-redox
|
|
else ifeq ($(ARCH),i686)
|
|
override ARCH:=i586
|
|
GNU_TARGET=i686-unknown-redox
|
|
else
|
|
GNU_TARGET=$(ARCH)-unknown-redox
|
|
endif
|
|
|
|
|
|
all: $(BUILD)/kernel $(BUILD)/kernel.sym
|
|
|
|
LD_SCRIPT=$(SOURCE)/linkers/$(ARCH).ld
|
|
LOCKFILE=$(SOURCE)/Cargo.lock
|
|
MANIFEST=$(SOURCE)/Cargo.toml
|
|
TARGET_SPEC=$(RUST_TARGET_PATH)/$(ARCH)-unknown-kernel.json
|
|
|
|
KERNEL_CARGO_FEATURES?=
|
|
|
|
$(BUILD)/kernel.all: $(LD_SCRIPT) $(LOCKFILE) $(MANIFEST) $(TARGET_SPEC) $(shell find $(SOURCE) -name "*.rs" -type f)
|
|
cd $(SOURCE) && RUSTUP_TOOLCHAIN=nightly-2025-10-03 cargo rustc \
|
|
-Z build-std=core,alloc -Zbuild-std-features=compiler-builtins-mem \
|
|
--bin kernel \
|
|
--manifest-path "$(MANIFEST)" \
|
|
--target "$(TARGET_SPEC)" \
|
|
--release \
|
|
--features=$(KERNEL_CARGO_FEATURES) \
|
|
-- \
|
|
-C link-arg=-T -Clink-arg="$(LD_SCRIPT)" \
|
|
-C link-arg=-z -Clink-arg=max-page-size=0x1000 \
|
|
--emit link="$(BUILD)/kernel.all"
|
|
|
|
$(BUILD)/kernel.sym: $(BUILD)/kernel.all
|
|
$(GNU_TARGET)-objcopy \
|
|
--only-keep-debug \
|
|
"$(BUILD)/kernel.all" \
|
|
"$(BUILD)/kernel.sym"
|
|
|
|
$(BUILD)/kernel: $(BUILD)/kernel.all
|
|
$(GNU_TARGET)-objcopy \
|
|
--strip-debug \
|
|
"$(BUILD)/kernel.all" \
|
|
"$(BUILD)/kernel"
|
|
|
|
KERNEL_CHECK_FEATURES?=
|
|
|
|
check:
|
|
cargo check \
|
|
--bin kernel \
|
|
--manifest-path "$(MANIFEST)" \
|
|
--target "$(TARGET_SPEC)" \
|
|
-Z build-std=core,alloc -Zbuild-std-features=compiler-builtins-mem -Z target-spec-json \
|
|
--features=$(KERNEL_CHECK_FEATURES)
|