Skip to content

bldr: exclude from workspace clippy and simplify build script #1159

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

Open
luigix25 wants to merge 3 commits into
base: main
Choose a base branch
from
+9 −10
Open

bldr: exclude from workspace clippy and simplify build script #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
982a129
Makefile: refactor bare-metal packages into a variable
luigix25 Jul 7, 2026
69288e7
Makefile: exclude bldr from workspace clippy
luigix25 Jul 7, 2026
bb3f90f
bldr: always pass --build-id=none linker flag
luigix25 Jul 7, 2026
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
12 changes: 8 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ CARGO ?= cargo
CLIPPY_OPTIONS ?= --all-features
CLIPPY_ARGS ?= -D warnings

# Packages that require --target x86_64-unknown-none
BARE_METAL_MEMBERS := svsm bldr stage1
BARE_METAL_EXCLUDES := $(addprefix --exclude ,$(BARE_METAL_MEMBERS))

ifdef CARGO_HACK
CARGO = cargo hack
CLIPPY_OPTIONS = --each-feature
Expand Down Expand Up @@ -157,11 +161,11 @@ endif
touch ${FS_BIN}

clippy:
${CARGO} clippy ${CLIPPY_OPTIONS} --workspace --exclude svsm --exclude stage1 --exclude svsm-fuzz -- ${CLIPPY_ARGS}
${CARGO} clippy ${CLIPPY_OPTIONS} --workspace $(BARE_METAL_EXCLUDES) --exclude svsm-fuzz -- ${CLIPPY_ARGS}
RUSTFLAGS="--cfg fuzzing" ${CARGO} clippy ${CLIPPY_OPTIONS} --package svsm-fuzz -- ${CLIPPY_ARGS}
${CARGO} clippy ${CLIPPY_OPTIONS} --package svsm --target x86_64-unknown-none -- ${CLIPPY_ARGS}
${CARGO} clippy ${CLIPPY_OPTIONS} --package bldr --target x86_64-unknown-none -- ${CLIPPY_ARGS}
${CARGO} clippy ${CLIPPY_OPTIONS} --package stage1 --target x86_64-unknown-none -- ${CLIPPY_ARGS}
for pkg in $(BARE_METAL_MEMBERS); do \
${CARGO} clippy ${CLIPPY_OPTIONS} --package $$pkg --target x86_64-unknown-none -- ${CLIPPY_ARGS} || exit 1; \
done
${CARGO} clippy ${CLIPPY_OPTIONS} --workspace --tests --exclude svsm -- ${CLIPPY_ARGS}
${CARGO} clippy ${CLIPPY_OPTIONS} --package svsm --tests -- ${CLIPPY_ARGS}

Expand Down
7 changes: 1 addition & 6 deletions boot/bldr/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
// Author: Joerg Roedel <jroedel@suse.de>

fn main() {
let target = std::env::var("TARGET").unwrap();

if target == "x86_64-unknown-none" {
println!("cargo:rustc-link-arg=--build-id=none");
}

println!("cargo:rustc-link-arg=--build-id=none");
println!("cargo:rustc-link-arg=-nostdlib");
println!("cargo:rustc-link-arg=-Tboot/bldr/src/bldr.lds");
println!("cargo:rustc-link-arg=-no-pie");
Expand Down