commit 3440835748594e647bed6aa458c959ba6743970a
author Tom Cherry <tomcherry@google.com> Mon Aug 19 16:39:57 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 19 16:39:57 2019 +0000
tree 18633ce0ba4462baef6d1cff4a64f2cbd000ffd0
parent a701d9071ecc4485c4ea58cde8d5087c8b8eb5e9
parent e4802329e6f442b41147a1059d27e13d659a4f19

Merge "Add -Wl,--exclude-libs=libclang_rt.builtins to ldflags"

cc/linker.go

diff --git a/cc/linker.go b/cc/linker.go
index 962fcce..563ad04 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -383,6 +383,10 @@
 		flags.LdFlags = append(flags.LdFlags, "-lfdio", "-lzircon")
 	}
 
+	if ctx.toolchain().LibclangRuntimeLibraryArch() != "" {
+		flags.LdFlags = append(flags.LdFlags, "-Wl,--exclude-libs="+config.BuiltinsRuntimeLibrary(ctx.toolchain())+".a")
+	}
+
 	CheckBadLinkerFlags(ctx, "ldflags", linker.Properties.Ldflags)
 
 	flags.LdFlags = append(flags.LdFlags, proptools.NinjaAndShellEscapeList(linker.Properties.Ldflags)...)