From 8bf2b676b7ed6990eea38ed8443b8b67949e4be7 Mon Sep 17 00:00:00 2001
From: Chad Austin <chadaustin@fb.com>
Date: Tue, 8 Feb 2022 14:06:41 -0800
Subject: [PATCH] fix windows builds

Summary:
The new boost has an MSVC detection algorithm that 1) I don't
understand and 2) does not even seem deterministic. Since our internal
builds are pinned to vc142, force that in the manifest.

Reviewed By: fanzeyi

Differential Revision: D34085081

fbshipit-source-id: d8ce4d8e28aad14f6fa60f9227dafb546ce321e5
---
 build/fbcode_builder/getdeps/builder.py | 8 ++++++++
 build/fbcode_builder/manifests/boost    | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py
index c6bbbd656..14b855474 100644
--- a/build/fbcode_builder/getdeps/builder.py
+++ b/build/fbcode_builder/getdeps/builder.py
@@ -486,6 +486,14 @@ if __name__ == "__main__":
         self.defines = defines or {}
         if extra_cmake_defines:
             self.defines.update(extra_cmake_defines)
+
+        try:
+            from .facebook.vcvarsall import extra_vc_cmake_defines
+        except ImportError:
+            pass
+        else:
+            self.defines.update(extra_vc_cmake_defines)
+
         self.loader = loader
         if build_opts.shared_libs:
             self.defines["BUILD_SHARED_LIBS"] = "ON"
diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost
index 482757030..f544114e2 100644
--- a/build/fbcode_builder/manifests/boost
+++ b/build/fbcode_builder/manifests/boost
@@ -103,3 +103,6 @@ pch=off
 
 [b2.args.os=darwin]
 toolset=clang
+
+[b2.args.all(os=windows,fb=on)]
+toolset=msvc-14.2