https://gcc.gnu.org/g:90f5dabddbdc47bfbabaabb5b560d3d5cc2acf9c
commit r15-8001-g90f5dabddbdc47bfbabaabb5b560d3d5cc2acf9c
Author: Jason Merrill <ja...@redhat.com>
Date: Tue Mar 11 17:43:35 2025 -0400
contrib: relpath.sh /lib /include [PR119081]
Previously, if the common ancestor of the two paths is / we would print the
absolute second argument, but this PR asks for a relative path in that case
as well, which makes sense for the libstdc++.modules.json use case.
PR libstdc++/119081
contrib/ChangeLog:
* relpath.sh: Give relative path even at /.
Diff:
---
contrib/relpath.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/relpath.sh b/contrib/relpath.sh
index ac6b769ef81a..1b329fc04a78 100755
--- a/contrib/relpath.sh
+++ b/contrib/relpath.sh
@@ -59,9 +59,9 @@ while [ "${to#$from}" = "$to" ]; do
from=$(dirname $from);
back=../$back
- if [ "$from" = "/" ]; then
- echo $to
- exit 0
+ if [ "$from" = / ] && [ "${to#/}" = "$to" ]; then
+ echo no common ancestor between $1 and $2 >&2
+ exit 1
elif [ "$from" = . ]; then
echo no common ancestor between $1 and $2 >&2
exit 1
