Skip to content

Commit bb5e140

Browse files
authored
Merge pull request #12167 from dotty-staging/fix-11989
Fix #11989: Remove dependency on find
2 parents 007dacd + 1f77685 commit bb5e140

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

dist/bin/common

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,18 @@ fi
133133
# *-------------------------------------------------*/
134134

135135
find_lib () {
136-
local lib=$(find $PROG_HOME/lib/ -name "$1")
137-
if [ -n "$CYGPATHCMD" ]; then
138-
"$CYGPATHCMD" -am $lib
139-
elif [[ $mingw || $msys ]]; then
140-
echo $lib | sed 's|/|\\\\|g'
141-
else
142-
echo $lib
143-
fi
136+
for lib in "$PROG_HOME"/lib/$1 ; do
137+
if [[ -f "$lib" ]]; then
138+
if [ -n "$CYGPATHCMD" ]; then
139+
"$CYGPATHCMD" -am "$lib"
140+
elif [[ $mingw || $msys ]]; then
141+
echo "$lib" | sed 's|/|\\\\|g'
142+
else
143+
echo "$lib"
144+
fi
145+
return
146+
fi
147+
done
144148
}
145149

146150
DOTTY_COMP=$(find_lib "*scala3-compiler*")

0 commit comments

Comments
 (0)