diff --git a/build/fbcode_builder/specs/fmt.py b/build/fbcode_builder/specs/fmt.py
index f0afac5e03..9e3a334675 100644
--- a/build/fbcode_builder/specs/fmt.py
+++ b/build/fbcode_builder/specs/fmt.py
@@ -8,6 +8,16 @@ from __future__ import unicode_literals
 
 def fbcode_builder_spec(builder):
     builder.add_option('fmtlib/fmt:git_hash', '6.2.1')
+    builder.add_option(
+        'fmtlib/fmt:cmake_defines',
+        {
+            # Avoids a bizarred failure to run tests in Bistro:
+            #   test_crontab_selector: error while loading shared libraries:
+            #   libfmt.so.6: cannot open shared object file:
+            #   No such file or directory
+            'BUILD_SHARED_LIBS': 'OFF',
+        }
+    )
     return {
         'steps': [
             builder.github_project_workdir('fmtlib/fmt', 'build'),
diff --git a/build/fbcode_builder/specs/folly.py b/build/fbcode_builder/specs/folly.py
index 3d128b9c07..09e1531c4b 100644
--- a/build/fbcode_builder/specs/folly.py
+++ b/build/fbcode_builder/specs/folly.py
@@ -5,9 +5,12 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import specs.fmt as fmt
+
 
 def fbcode_builder_spec(builder):
     return {
+        "depends_on": [fmt],
         'steps': [
             # on macOS the filesystem is typically case insensitive.
             # We need to ensure that the CWD is not the folly source