Fix build leakages (#7141)

The recent change to applying patches leaves the submodule dirty based on
"new commits" being present.  This ensures we clean up so the tree no longer
reports dirty after a `go generate ./...` run.

The Makefile was being a bit too aggressive in cleaning things up and would result in deleting the placeholder files which someone might accidentally commit.
This commit is contained in:
Daniel Hiltgen
2024-10-08 13:04:59 -07:00
committed by GitHub
parent 96efd9052f
commit f9584deba5
2 changed files with 2 additions and 10 deletions

View File

@@ -133,13 +133,5 @@ install() {
# Keep the local tree clean after we're done with the build
cleanup() {
(cd ${LLAMACPP_DIR}/ && git checkout CMakeLists.txt)
if [ -n "$(ls -A ../patches/*.diff)" ]; then
for patch in ../patches/*.diff; do
for file in $(grep "^+++ " ${patch} | cut -f2 -d' ' | cut -f2- -d/); do
(cd ${LLAMACPP_DIR}; git checkout ${file})
done
done
fi
git submodule update --force ${LLAMACPP_DIR}
}