Merge pull request #1317 from jpoimboe/fix-make-check

kpatch-build: fix "make check"
This commit is contained in:
Josh Poimboeuf 2022-12-01 10:46:33 -06:00 committed by GitHub
commit 063a0801d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -452,12 +452,12 @@ relpath() {
return
fi
while [[ "${filedir#$common/}" = "$filedir" ]]; do
while [[ "${filedir#"$common"/}" = "$filedir" ]]; do
common="$(dirname "$common")"
result="../$result"
done
result="${result}${filedir#$common/}"
result="${result}${filedir#"$common"/}"
echo "${result}/$(basename "$file")"
}

View File

@ -23,7 +23,7 @@ if [[ "$TOOLCHAINCMD" =~ ^(.*-)?gcc$ || "$TOOLCHAINCMD" =~ ^(.*-)?clang$ ]] ; th
[[ "$obj" = */.tmp_mc_*.o ]] && break;
[[ "$obj" = */.tmp_*.o ]] && obj="${obj/.tmp_/}"
relobj=${obj##$KPATCH_GCC_SRCDIR/}
relobj=${obj##"$KPATCH_GCC_SRCDIR"/}
case "$relobj" in
*.mod.o|\
*built-in.o|\