From 087bba735654e0eee6ad08188c7c631a61a22563 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Thu, 29 Nov 2018 17:19:25 -0800 Subject: [PATCH] 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 --- cc/stl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/stl.go b/cc/stl.go index 9dc8107e5..487087015 100644 --- a/cc/stl.go +++ b/cc/stl.go @@ -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"}, }