From 77fec32429a3820fff1858a97b4464730f9e2af8 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Wed, 3 Jun 2026 08:09:54 +0000
Subject: [PATCH] generate-config.sh: Support running from contexts where O is
 set

When invoked from a context like this...

   my-infix-spin$ make O=x-my-build x86_64_defconfig

...where the spin's Makefile would trigger the generation of the
defconfig based on some fragments, the value of O passed via the
environment would be ignored since the spin's Makefile typically
overrides it.

Therefore, pass it as a make variable instead, which takes precedence.
---
 utils/generate-defconfig.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/generate-defconfig.sh b/utils/generate-defconfig.sh
index 4cdd7a59..37d5b646 100755
--- a/utils/generate-defconfig.sh
+++ b/utils/generate-defconfig.sh
@@ -81,6 +81,6 @@ done
 TMPDIR=`mktemp -d`
 $MERGE_CONFIG -O "$TMPDIR" "$base" "$changes"
 
-O="$TMPDIR" make savedefconfig
+make O="$TMPDIR" savedefconfig
 mv "$TMPDIR"/defconfig "$output"
 rm -r "$TMPDIR"