From 132f959e5eb654b4a6e6a88c352225b4cd9d6ecb Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Thu, 29 Nov 2018 17:22:32 -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: If5a5ffaa9d822ca05b4b54896937f224103f33d7 --- core/cxx_stl_setup.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 3590079d71..25fd642864 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -51,8 +51,8 @@ linux_static_gcclibs := -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group darwin_dynamic_gcclibs := -lc -lSystem darwin_static_gcclibs := NO_STATIC_HOST_BINARIES_ON_DARWIN windows_dynamic_gcclibs := \ - -Wl,--start-group -lmingw32 -lgcc -lgcc_eh -lmoldname -lmingwex -lmsvcr110 \ - -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32 -lpsapi \ + -Wl,--start-group -lmingw32 -lgcc -lgcc_eh -lmoldname -lmingwex \ + -lmsvcrt -lucrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32 -lpsapi \ -Wl,--end-group windows_static_gcclibs := NO_STATIC_HOST_BINARIES_ON_WINDOWS