aboutsummaryrefslogtreecommitdiffstats
path: root/func.go
diff options
context:
space:
mode:
authorFumitoshi Ukai <ukai@google.com>2015-07-28 14:15:33 +0900
committerFumitoshi Ukai <ukai@google.com>2015-07-28 14:15:33 +0900
commit4a2b927d408fb68a6b7f85f2d5ee5b678c9939c0 (patch)
tree7fe993eb78911ee736b6d21c0d575b67b2c93ca3 /func.go
parent701b0e04fb6329219cf3a5b4ee4dbe4d41c1e261 (diff)
downloadandroid_build_kati-4a2b927d408fb68a6b7f85f2d5ee5b678c9939c0.tar.gz
android_build_kati-4a2b927d408fb68a6b7f85f2d5ee5b678c9939c0.tar.bz2
android_build_kati-4a2b927d408fb68a6b7f85f2d5ee5b678c9939c0.zip
[go] fix wildcard in ninja generation
- use -f for /bin/ls: for wildcard.mk wildcard_mult.mk - no need to handle avoidIO? - wildcard_cache.mk
Diffstat (limited to 'func.go')
-rw-r--r--func.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/func.go b/func.go
index 50234dc..78c6332 100644
--- a/func.go
+++ b/func.go
@@ -574,9 +574,10 @@ func (f *funcWildcard) Eval(w evalWriter, ev *Evaluator) error {
return err
}
te := traceEvent.begin("wildcard", tmpval(wb.Bytes()), traceEventMain)
- if ev.avoidIO {
+ if false && ev.avoidIO {
+ // no need to handle avoidIO? - wildcard_cache.mk
ev.hasIO = true
- io.WriteString(w, "$(/bin/ls -d ")
+ io.WriteString(w, "$(/bin/ls -f -d ")
w.Write(wb.Bytes())
io.WriteString(w, " 2> /dev/null)")
wb.release()