Skip to content

Commit 61b5812

Browse files
ahornbymeta-codesync[bot]
authored andcommitted
fix edencommon build on windows
Summary: Fix edencommon build on windows, noticed it was breaking the watchman build. * fix boost local build with vs build tools 2022 17.14 update. Without this could not build boost locally. Apply patch as per boostorg/boost#914 * in buildopts.py check the 32 bit install location as non-github windows machines like my laptop end up with it installed there * fix the actual problem in edencommon `error C2039: 'wstring': is not a member of 'std'` , which was a missing <string> include Reviewed By: bigfootjon Differential Revision: D86630363 fbshipit-source-id: b4993c74cd51d326efb458a6dc461d355f8daeab
1 parent c8ff161 commit 61b5812

3 files changed

Lines changed: 20 additions & 2 deletions

File tree

build/fbcode_builder/getdeps/buildopts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def __init__(
165165
)
166166

167167
# then the 32 bit ones
168-
for year in ["2019", "2017"]:
168+
for year in ["2022", "2019", "2017"]:
169169
vcvarsall += glob.glob(
170170
os.path.join(
171171
os.environ["ProgramFiles(x86)"],

build/fbcode_builder/manifests/boost

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ boost-static
6565
[build]
6666
builder = boost
6767
job_weight_mib = 512
68-
patchfile = boost_comparator_operator_fix.patch
68+
patchfile = boost_1_83_0.patch
6969

7070
[b2.args]
7171
--with-atomic

build/fbcode_builder/patches/boost_comparator_operator_fix.patch renamed to build/fbcode_builder/patches/boost_1_83_0.patch

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,21 @@ diff --git a/boost/serialization/strong_typedef.hpp b/boost/serialization/strong
99
bool operator<(const D& rhs) const {return t < rhs.t;} \
1010
};
1111

12+
diff --git a/tools/build/src/tools/msvc.jam b/tools/build/src/tools/msvc.jam
13+
--- a/tools/build/src/tools/msvc.jam
14+
+++ b/tools/build/src/tools/msvc.jam
15+
@@ -1137,6 +1137,14 @@
16+
}
17+
else
18+
{
19+
+ if [ MATCH "(14.4)" : $(version) ]
20+
+ {
21+
+ if $(.debug-configuration)
22+
+ {
23+
+ ECHO "notice: [generate-setup-cmd] $(version) is 14.4x" ;
24+
+ }
25+
+ parent = [ path.native [ path.join $(parent) "..\\..\\..\\..\\..\\Auxiliary\\Build" ] ] ;
26+
+ }
27+
if [ MATCH "(14.3)" : $(version) ]
28+
{
29+
if $(.debug-configuration)

0 commit comments

Comments
 (0)