diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-02-29 20:58:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 20:58:14 +0000 |
| commit | 4e2594e20a7c368eddd8c6dce174b34775d5a7f1 (patch) | |
| tree | c29a5e47e34bc896367ebb4a355c28ba942641c6 | |
| parent | 33f110f428dd63b9bf7e7f6b5c1750463443b7d5 (diff) | |
| parent | 45ac47edab3fa94b9dae36330ec37b1105223c08 (diff) | |
Merge changes I34385c48,I1e48947c into main am: 45ac47edab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983535
Change-Id: I223f80828e80829d151fa9dd599ac0ecfee9858b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cc/prebuilt.go | 3 | ||||
| -rw-r--r-- | cc/stl.go | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/cc/prebuilt.go b/cc/prebuilt.go index 8f4b7df42..cbb5d58db 100644 --- a/cc/prebuilt.go +++ b/cc/prebuilt.go @@ -260,6 +260,9 @@ func (p *prebuiltLibraryLinker) nativeCoverage() bool { func (p *prebuiltLibraryLinker) disablePrebuilt() { p.properties.Srcs = nil + p.properties.Sanitized.None.Srcs = nil + p.properties.Sanitized.Address.Srcs = nil + p.properties.Sanitized.Hwaddress.Srcs = nil } // Implements versionedInterface @@ -205,12 +205,14 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags { flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++") if ctx.Windows() { flags.Local.CppFlags = append(flags.Local.CppFlags, - // Disable visiblity annotations since we're using static - // libc++. - "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", - "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", + // These macros can also be defined by libc++'s __config + // or __config_site headers so define them the same way + // (i.e. to nothing). Disable visibility annotations since + // we're using static libc++. + "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS=", + "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS=", // Use Win32 threads in libc++. - "-D_LIBCPP_HAS_THREAD_API_WIN32") + "-D_LIBCPP_HAS_THREAD_API_WIN32=") } } case "libstdc++": |