Use bootstrap linker for asan build

am: a2aca28750 Change-Id: I6b45d6863a72be558fda41faf4ac1d315f1066e1
2019-02-03 07:37:16 -08:00 · 2019-02-03 07:37:16 -08:00 · 03f7c2110c
parent a60c43aa23 a2aca28750
commit 03f7c2110c
1 changed files with 5 additions and 1 deletions
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@ -444,7 +444,11 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
 			flags.LdFlags = append(flags.LdFlags, "-Wl,--no-as-needed")
 		} else {
 			flags.CFlags = append(flags.CFlags, "-mllvm", "-asan-globals=0")
-			flags.DynamicLinker = "/system/bin/linker_asan"
+			if ctx.bootstrap() {
+				flags.DynamicLinker = "/system/bin/bootstrap/linker_asan"
+			} else {
+				flags.DynamicLinker = "/system/bin/linker_asan"
+			}
 			if flags.Toolchain.Is64Bit() {
 				flags.DynamicLinker += "64"
 			}