From f9d0ee313c815f7d2b322f0c68d20b539465ce38 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 22 May 2017 20:49:15 -0700
Subject: [vcpkg] Avoid modifying static globals after initialization

---
 toolsrc/src/PostBuildLint.cpp | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'toolsrc/src/PostBuildLint.cpp')

diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index a8365e109..4491f3f2e 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -48,27 +48,34 @@ namespace vcpkg::PostBuildLint
 
     const std::vector<OutdatedDynamicCrt>& get_outdated_dynamic_crts(const std::map<BuildPolicies, bool>& policies)
     {
-        static std::vector<OutdatedDynamicCrt> v = {{"msvcp100.dll", R"(msvcp100\.dll)"},
-                                                    {"msvcp100d.dll", R"(msvcp100d\.dll)"},
-                                                    {"msvcp110.dll", R"(msvcp110\.dll)"},
-                                                    {"msvcp110_win.dll", R"(msvcp110_win\.dll)"},
-                                                    {"msvcp120.dll", R"(msvcp120\.dll)"},
-                                                    {"msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)"},
-                                                    {"msvcp60.dll", R"(msvcp60\.dll)"},
-                                                    {"msvcp60.dll", R"(msvcp60\.dll)"},
-
-                                                    {"msvcr100.dll", R"(msvcr100\.dll)"},
-                                                    {"msvcr100d.dll", R"(msvcr100d\.dll)"},
-                                                    {"msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)"},
-                                                    {"msvcr110.dll", R"(msvcr110\.dll)"},
-                                                    {"msvcr120.dll", R"(msvcr120\.dll)"},
-                                                    {"msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)"},
-                                                    {"msvcrt20.dll", R"(msvcrt20\.dll)"},
-                                                    {"msvcrt40.dll", R"(msvcrt40\.dll)"}};
+        static const std::vector<OutdatedDynamicCrt> v_no_msvcrt = {
+            {"msvcp100.dll", R"(msvcp100\.dll)"},
+            {"msvcp100d.dll", R"(msvcp100d\.dll)"},
+            {"msvcp110.dll", R"(msvcp110\.dll)"},
+            {"msvcp110_win.dll", R"(msvcp110_win\.dll)"},
+            {"msvcp120.dll", R"(msvcp120\.dll)"},
+            {"msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)"},
+            {"msvcp60.dll", R"(msvcp60\.dll)"},
+            {"msvcp60.dll", R"(msvcp60\.dll)"},
+
+            {"msvcr100.dll", R"(msvcr100\.dll)"},
+            {"msvcr100d.dll", R"(msvcr100d\.dll)"},
+            {"msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)"},
+            {"msvcr110.dll", R"(msvcr110\.dll)"},
+            {"msvcr120.dll", R"(msvcr120\.dll)"},
+            {"msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)"},
+            {"msvcrt20.dll", R"(msvcrt20\.dll)"},
+            {"msvcrt40.dll", R"(msvcrt40\.dll)"}};
+
+        static const std::vector<OutdatedDynamicCrt> v = [&]() {
+            auto ret = v_no_msvcrt;
+            ret.push_back(OutdatedDynamicCrt{"msvcrt.dll", R"(msvcrt\.dll)"});
+            return ret;
+        }();
 
         if (contains_and_enabled(policies, BuildPoliciesC::ALLOW_OBSOLETE_MSVCRT))
         {
-            v.push_back(OutdatedDynamicCrt{"msvcrt.dll", R"(msvcrt\.dll)"});
+            return v_no_msvcrt;
         }
 
         return v;
-- 
cgit v1.2.3