Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6453295 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not explicitly link ucrt, ucrtbase"

parents 74233980 b8eefa89

cc/stl.go

+0 −5
Original line number Diff line number Diff line
@@ -235,11 +235,6 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags { 
			flags.Local.CppFlags = append(flags.Local.CppFlags, "-nostdinc++")

			flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++")

			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

				// exception model for 32-bit.

				if ctx.Arch().ArchType == android.X86 {