Skip to content

rust/Makefile*: remove -Z build options for NO_STD builds #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
antklein wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

rust/Makefile*: remove -Z build options for NO_STD builds #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .sync/rust/Makefiles/Makefile-patina-dxe-core-qemu.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
default_to_workspace = false

[env]
NO_STD_FLAGS = "--profile ${RUSTC_PROFILE} -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem -Zunstable-options --timings"
NO_STD_FLAGS = "--profile ${RUSTC_PROFILE} --timings"
STD_FLAGS = "--profile ${RUSTC_PROFILE} --features std"
COV_FLAGS = { value = "--workspace --profile test --ignore-filename-regex .*test.*", condition = { env_not_set = ["COV_FLAGS"] } }
RUSTDOCFLAGS = "-D warnings -D missing_docs"
Expand Down
2 changes: 1 addition & 1 deletion .sync/rust/Makefiles/Makefile-patina-mtrr.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
default_to_workspace = false

[env]
BUILD_FLAGS = "--profile ${RUSTC_PROFILE} -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem -Zunstable-options --timings"
BUILD_FLAGS = "--profile ${RUSTC_PROFILE} --timings"
Copy link

Copilot AI Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Makefile updates BUILD_FLAGS, but later tasks still reference NO_STD_FLAGS and STD_FLAGS which are not defined in this file. That means check_no_std / check_std may not apply the intended flags (or may fail if unset vars aren’t tolerated). Consider defining NO_STD_FLAGS/STD_FLAGS in [env] or refactoring the check tasks to use BUILD_FLAGS consistently.

Suggested change
BUILD_FLAGS = "--profile ${RUSTC_PROFILE} --timings"
BUILD_FLAGS = "--profile ${RUSTC_PROFILE} --timings"
STD_FLAGS = "${BUILD_FLAGS} --features std"
NO_STD_FLAGS = "${BUILD_FLAGS} --no-default-features"

Copilot uses AI. Check for mistakes.
UEFI_CRATES = "-p patina_mtrr"
BUILD_CRATES = "-p patina_mtrr"
COV_FLAGS = { value = "--workspace --profile test --ignore-filename-regex .*test.*", condition = { env_not_set = ["COV_FLAGS"] } }
Expand Down
2 changes: 1 addition & 1 deletion .sync/rust/Makefiles/Makefile-patina-paging.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
default_to_workspace = false

[env]
BUILD_FLAGS = "--profile ${RUSTC_PROFILE} -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem -Zunstable-options --timings"
BUILD_FLAGS = "--profile ${RUSTC_PROFILE} --timings"
Copy link

Copilot AI Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Makefile defines BUILD_FLAGS, but later tasks (e.g. check_no_std / check_std) still reference NO_STD_FLAGS and STD_FLAGS, which are not defined anywhere in this file. This can make those tasks run without the intended flags (or fail, depending on how @@split handles an unset var). Consider either defining NO_STD_FLAGS/STD_FLAGS in [env] (as done in other Patina Makefiles) or updating the tasks to consistently use BUILD_FLAGS plus any required std/no_std feature flags.

Suggested change
BUILD_FLAGS = "--profile ${RUSTC_PROFILE} --timings"
BUILD_FLAGS = "--profile ${RUSTC_PROFILE} --timings"
NO_STD_FLAGS = "${BUILD_FLAGS}"
STD_FLAGS = "${BUILD_FLAGS}"

Copilot uses AI. Check for mistakes.
UEFI_CRATES = "-p patina_paging"
BUILD_CRATES = "-p patina_paging"
COV_FLAGS = { value = "--profile test --ignore-filename-regex **/tests/*", condition = { env_not_set = ["COV_FLAGS"] } }
Expand Down
3 changes: 1 addition & 2 deletions .sync/rust/Makefiles/Makefile-patina-readiness-tool.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ X86_64_STD_LINUX_TARGET = "--target x86_64-unknown-linux-gnu"
AARCH64_UEFI_TARGET = "--target aarch64-unknown-uefi"
X86_64_UEFI_TARGET = "--target x86_64-unknown-uefi"

NO_STD_FLAGS = "-Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem -Zunstable-options"
DXE_READINESS_PKG = "-p dxe_readiness_capture"
CAPTURE_BIN_FLAGS = "${NO_STD_FLAGS} ${DXE_READINESS_PKG}"
CAPTURE_BIN_FLAGS = "${DXE_READINESS_PKG}"
CAPTURE_UEFI_SHELL_FLAGS = "${DXE_READINESS_PKG} --features uefishell --bin uefishell_dxe_readiness_capture"

# DXE Readiness Capture UEFI binaries to run from UEFI Shell.
Expand Down
2 changes: 1 addition & 1 deletion .sync/rust/Makefiles/Makefile-patina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
default_to_workspace = false

[env]
NO_STD_FLAGS = "--profile ${RUSTC_PROFILE} -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem -Zunstable-options --timings"
NO_STD_FLAGS = "--profile ${RUSTC_PROFILE} --timings"
STD_FLAGS = "--profile ${RUSTC_PROFILE} --features std"
COV_FLAGS = { value = "--workspace --profile test --ignore-filename-regex .*test.*", condition = { env_not_set = ["COV_FLAGS"] } }
RUSTDOCFLAGS = "-D warnings -D missing_docs"
Expand Down
Loading