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

Merge "Do not explicitly link ucrt, ucrtbase" am: c6453295a2

Browse Source 
Change-Id: Ia5f3fc6d1032cb1ea664fe6d994d2e66ef1ab823
This commit is contained in:
Automerger Merge Worker
2020-03-07 21:40:09 +00:00
parent a01b1cf891 c6453295a2
commit f035f6f5f6
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/stl.go
View File

@@ -235,11 +235,6 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags {
flags.Local.CppFlags = append(flags.Local.CppFlags, "-nostdinc++") flags.Local.CppFlags = append(flags.Local.CppFlags, "-nostdinc++")
flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++") flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++")
if ctx.Windows() { if ctx.Windows() {
if stl.Properties.SelectedStl == "libc++_static" {
// These are transitively needed by libc++_static.
flags.extraLibFlags = append(flags.extraLibFlags,
"-lmsvcrt", "-lucrt")
}
// Use SjLj exceptions for 32-bit. libgcc_eh implements SjLj // Use SjLj exceptions for 32-bit. libgcc_eh implements SjLj
// exception model for 32-bit. // exception model for 32-bit.
if ctx.Arch().ArchType == android.X86 { if ctx.Arch().ArchType == android.X86 {