Skip to content

Commit

Permalink
Read meson_vars.mk by name instead of taking its path from environment
Browse files Browse the repository at this point in the history
  • Loading branch information
tbodt committed Oct 22, 2024
1 parent 112d843 commit 736de39
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion deps/linux
Submodule linux updated 1 files
+2 −2 arch/ish/Makefile
9 changes: 4 additions & 5 deletions deps/linux-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

0 comments on commit 736de39

Please sign in to comment.