StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define libc++ config macros to nothing

Browse Source 
libc++[abi] always check whether one of these macros is defined, not
the value the macro is defined to. With the new libc++, there is a
Windows __config_site header that automatically defines
_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS and _LIBCPP_HAS_THREAD_API_WIN32
to nothing, so these definitions need to match to avoid a redefinition
error.

Bug: 175635923
Test: treehugger
Test: m adb
Change-Id: I1e48947c3b45e59804cdacd48776c7f3bd9a18c6
This commit is contained in:
Ryan Prichard
2024-01-18 23:57:38 -08:00
parent 8bf3013844
commit 718cf5bf19
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/stl.go
View File

@@ -205,12 +205,14 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags {
flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++") flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++")
if ctx.Windows() { if ctx.Windows() {
flags.Local.CppFlags = append(flags.Local.CppFlags, flags.Local.CppFlags = append(flags.Local.CppFlags,
// Disable visiblity annotations since we're using static // These macros can also be defined by libc++'s __config
// libc++. // or __config_site headers so define them the same way
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", // (i.e. to nothing). Disable visibility annotations since
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", // we're using static libc++.
"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS=",
"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS=",
// Use Win32 threads in libc++. // Use Win32 threads in libc++.
"-D_LIBCPP_HAS_THREAD_API_WIN32") "-D_LIBCPP_HAS_THREAD_API_WIN32=")
} }
} }
case "libstdc++": case "libstdc++":