diff --git a/Makefile b/Makefile
index 6c5ea3e8fe..b7de2a8e01 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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}
 
diff --git a/boot/bldr/build.rs b/boot/bldr/build.rs
index 7ca6a5793a..a212e4d9c4 100644
--- a/boot/bldr/build.rs
+++ b/boot/bldr/build.rs
@@ -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");