Update fbthrift

facebook · Sep 30, 2021 · 9fea264 · 9fea264
1 parent fb1e3df
commit 9fea264
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/mcrouter/Makefile.am b/mcrouter/Makefile.am
@@ -242,6 +242,7 @@ mcrouter_LDADD = \
   -ltransport \
   -lthriftprotocol \
   -lrpcmetadata \
+  -lthriftmetadata \
   -lasync \
   -lconcurrency \
   -lthrift-core \

diff --git a/mcrouter/lib/network/test/Makefile.am b/mcrouter/lib/network/test/Makefile.am
@@ -20,6 +20,7 @@ mock_mc_server_LDADD = \
 	-ltransport \
 	-lthriftprotocol \
 	-lrpcmetadata \
+  -lthriftmetadata \
 	-lasync \
 	-lconcurrency \
 	-lthrift-core \

diff --git a/mcrouter/scripts/recipes/fbthrift.sh b/mcrouter/scripts/recipes/fbthrift.sh
@@ -13,7 +13,10 @@ fi
 cd "$PKG_DIR/fbthrift" || die "cd fail"
 
 # Use a known compatible version
-# v2020.08.24.00 - Published stable release - CMake linking errors
+# v2020.08.24.00
+#   Published stable release - CMake linking errors
+# v2021.09.27.00
+#   This needs to be linked closely to Folly and this version works well with extra linking fix in mcrouter
 gitEnsureTreeish v2021.09.27.00
 
 cd "$PKG_DIR/fbthrift/build" || die "cd fbthrift failed"