fix deps.bash. \t does not mean tab in some seds.

also: add /dev/null to the ls args to repair handling of empty dependency lists.

R=rsc
CC=golang-dev
https://golang.org/cl/883045

diff --git a/src/pkg/deps.bash b/src/pkg/deps.bash
index 73888dff00f13fcb7aa771a147825ce6a1f17a0e..c8406d39cf67785118d4c8cef194712c9cd8a2d4 100755 (executable)
--- a/src/pkg/deps.bash
+++ b/src/pkg/deps.bash
@@ -18,10 +18,12 @@ dirpat=$(echo $dirs | sed 's/ /|/g; s/.*/^(&)$/')
 for dir in $dirs; do (
        cd $dir || exit 1
 
-       sources=$(sed -n 's/^[ \t]*\([^ \t]*\.go\)[ \t]*\\*[ \t]*$/\1/p' Makefile)
+       sources=$(sed -n 's/^[  ]*\([^  ]*\.go\)[       ]*\\*[  ]*$/\1/p' Makefile)
        sources=$(echo $sources | sed 's/\$(GOOS)/'$GOOS'/g')
        sources=$(echo $sources | sed 's/\$(GOARCH)/'$GOARCH'/g')
-       sources=$(ls $sources 2> /dev/null)  # remove .s, .c, etc.
+       # /dev/null here means we get an empty dependency list if $sources is empty
+       # instead of listing every file in the directory.
+       sources=$(ls $sources /dev/null 2> /dev/null)  # remove .s, .c, etc.
 
        deps=$(
                sed -n '/^import.*"/p; /^import[ \t]*(/,/^)/p' $sources /dev/null |