From 736de390978684e805c59e0a968180c4edaff353 Mon Sep 17 00:00:00 2001
From: Theodore Dubois <tblodt@icloud.com>
Date: Mon, 21 Oct 2024 23:37:51 -0700
Subject: [PATCH] Read meson_vars.mk by name instead of taking its path from
 environment

---
 deps/linux          | 2 +-
 deps/linux-build.sh | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/deps/linux b/deps/linux
index 31bf37ae3b..6d176c2862 160000
--- a/deps/linux
+++ b/deps/linux
@@ -1 +1 @@
-Subproject commit 31bf37ae3ba5b31ef5f7d277edabcd1fa88ad309
+Subproject commit 6d176c2862d07e5d60acbe4f0e5af1666df4faef
diff --git a/deps/linux-build.sh b/deps/linux-build.sh
index 8c1c875bc7..d24e28db7c 100755
--- a/deps/linux-build.sh
+++ b/deps/linux-build.sh
@@ -21,8 +21,7 @@ fi
 makeargs+=("LLVM_IAS=1")
 
 mkdir -p "$objtree"
-export ISH_MESON_VARS="$(realpath "$objtree/meson_vars.mk")"
-cat >"$ISH_MESON_VARS" <<END
+cat >"$(realpath "$objtree/meson_vars.mk")" <<END
 export ISH_CFLAGS = $ISH_CFLAGS
 export LIB_ISH_EMU = $LIB_ISH_EMU
 END
@@ -39,13 +38,13 @@ if [[ -n "$regen_config" ]]; then
     unset KCONFIG_CONFIG
 fi
 
-make -C "$srctree" O="$(realpath "$objtree")" "${makeargs[@]}" olddefconfig
-
 case "$(uname)" in
     Darwin) cpus=$(sysctl -n hw.ncpu) ;;
     Linux) cpus=$(nproc) ;;
     *) cpus=1 ;;
 esac
 
+make -C "$srctree" O="$(realpath "$objtree")" "${makeargs[@]}" olddefconfig
+
 make -C "$objtree" -j "$cpus" "${makeargs[@]}" all compile_commands.json --debug=v | "$srctree/../makefilter.py" "$depfile" "$output" "$objtree"
-cp "$objtree/vmlinux" "$output"
+cp "$objtree/vmlinux" "$output"
\ No newline at end of file