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

Commit 087bba73 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar
Browse files

Use libucrt instead of libmsvcr110 

Bug: http://b/117796718

ucrt is either preinstalled in newer Windows or can be installed in
older Windows, whereas a dependence on msvcr110 doesn't work on Windows
without additional dependencies.

Test: Run generated binaries on Windows VM (7, 8, and 10) without
installing any extra dependencies.

Change-Id: Ibfaea5d78ac85ff4eeed35c97ad8cae4b44dadbc
parent 3b67794d

cc/stl.go

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ func init() { 
		android.Linux:  []string{"-lgcc_s", "-lgcc", "-lc", "-lgcc_s", "-lgcc"},

		android.Darwin: []string{"-lc", "-lSystem"},

		android.Windows: []string{"-Wl,--start-group", "-lmingw32", "-lgcc", "-lgcc_eh",

			"-lmoldname", "-lmingwex", "-lmsvcr110", "-lmsvcrt", "-lpthread",

			"-lmoldname", "-lmingwex", "-lmsvcrt", "-lucrt", "-lpthread",

			"-ladvapi32", "-lshell32", "-luser32", "-lkernel32", "-lpsapi",

			"-Wl,--end-group"},

	}