Revert "Fix -Wl,--exclude-libs for clang runtime libraries"
This reverts commit 59de280a480cd7315de32adb7e4465a5480f7494.
Reason for revert: Broke mac tests
Bug: 235624976
Change-Id: I358bb14ec565f106483378f4798e3fc88c491f8f
diff --git a/cc/sanitize.go b/cc/sanitize.go
index c11900b..42a112e 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -588,6 +588,13 @@
}
func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags {
+ minimalRuntimeLib := config.UndefinedBehaviorSanitizerMinimalRuntimeLibrary(ctx.toolchain()) + ".a"
+
+ if sanitize.Properties.MinimalRuntimeDep {
+ flags.Local.LdFlags = append(flags.Local.LdFlags,
+ "-Wl,--exclude-libs,"+minimalRuntimeLib)
+ }
+
if !sanitize.Properties.SanitizerEnabled && !sanitize.Properties.UbsanRuntimeDep {
return flags
}
@@ -717,6 +724,7 @@
if enableMinimalRuntime(sanitize) {
flags.Local.CFlags = append(flags.Local.CFlags, strings.Join(minimalRuntimeFlags, " "))
+ flags.Local.LdFlags = append(flags.Local.LdFlags, "-Wl,--exclude-libs,"+minimalRuntimeLib)
}
if Bool(sanitize.Properties.Sanitize.Fuzzer) {
@@ -1209,7 +1217,7 @@
}
// static executable gets static runtime libs
- depTag := libraryDependencyTag{Kind: staticLibraryDependency, unexportedSymbols: true}
+ depTag := libraryDependencyTag{Kind: staticLibraryDependency}
variations := append(mctx.Target().Variations(),
blueprint.Variation{Mutator: "link", Variation: "static"})
if c.Device() {