From a4ef83b25284472fa2e45db79f8eb413dadf28d9 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Tue, 21 Apr 2020 17:08:35 -0700 Subject: [PATCH] Canonicalize saved paths, Kythe cannot handle symlinks Bug: 141385766 Test: build kzip Change-Id: I87c4af719135ee89298d160bb8d6395ad7d6046c --- cc/builder.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cc/builder.go b/cc/builder.go index 2bedd9c6e..4e8f1fa59 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -255,7 +255,11 @@ var ( kytheExtract = pctx.StaticRule("kythe", blueprint.RuleParams{ Command: `rm -f $out && ` + - `KYTHE_CORPUS=${kytheCorpus} KYTHE_OUTPUT_FILE=$out KYTHE_VNAMES=$kytheVnames KYTHE_KZIP_ENCODING=${kytheCuEncoding} ` + + `KYTHE_CORPUS=${kytheCorpus} ` + + `KYTHE_OUTPUT_FILE=$out ` + + `KYTHE_VNAMES=$kytheVnames ` + + `KYTHE_KZIP_ENCODING=${kytheCuEncoding} ` + + `KYTHE_CANONICALIZE_VNAME_PATHS=prefer-relative ` + `$cxxExtractor $cFlags $in `, CommandDeps: []string{"$cxxExtractor", "$kytheVnames"}, },