diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py
index 94b137f..ed328da 100755
--- a/build/fbcode_builder/getdeps.py
+++ b/build/fbcode_builder/getdeps.py
@@ -844,14 +844,20 @@ def run_project_cmd(self, args, loader, manifest):
         # Accumulate the install directories so that the build steps
         # can find their dep installation
         install_dirs = []
+        dep_manifests = []
 
         for m in projects:
             inst_dir = loader.get_project_install_dir_respecting_install_prefix(m)
             install_dirs.append(inst_dir)
+            dep_manifests.append(m)
 
             if m == manifest:
+                ctx = loader.ctx_gen.get_context(m.name)
+                env = loader.build_opts.compute_env_for_install_dirs(
+                    loader, dep_manifests, ctx
+                )
                 dep_munger = create_dyn_dep_munger(
-                    loader.build_opts, install_dirs, args.strip
+                    loader.build_opts, env, install_dirs, args.strip
                 )
                 if dep_munger is None:
                     print(f"dynamic dependency fixups not supported on {sys.platform}")
diff --git a/build/fbcode_builder/manifests/clang b/build/fbcode_builder/manifests/clang
new file mode 100644
index 0000000..a2133e0
--- /dev/null
+++ b/build/fbcode_builder/manifests/clang
@@ -0,0 +1,5 @@
+[manifest]
+name = clang
+
+[rpms]
+clang15-devel
diff --git a/build/fbcode_builder/manifests/glean b/build/fbcode_builder/manifests/glean
index 5dc3a87..7cb422c 100644
--- a/build/fbcode_builder/manifests/glean
+++ b/build/fbcode_builder/manifests/glean
@@ -21,6 +21,9 @@ glog
 folly
 rocksdb
 xxhash
+llvm
+clang
+re2
 
 [build]
 builder = make
@@ -29,8 +32,9 @@ builder = make
 cabal-update
 all
 glass
+glean-clang
 EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS
-CABAL_CONFIG_FLAGS=-f-clang-tests -f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests
+CABAL_CONFIG_FLAGS=-f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests
 
 [make.install_args]
 install
@@ -38,4 +42,4 @@ install
 [make.test_args]
 test
 EXTRA_GHC_OPTS=-j4 +RTS -A32m -n4m -RTS
-CABAL_CONFIG_FLAGS=-f-clang-tests -f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests
+CABAL_CONFIG_FLAGS=-f-hack-tests -f-typescript-tests -f-python-tests -f-dotnet-tests -f-go-tests -f-rust-tests -f-java-lsif-tests -f-flow-tests
diff --git a/build/fbcode_builder/manifests/llvm b/build/fbcode_builder/manifests/llvm
new file mode 100644
index 0000000..7b06922
--- /dev/null
+++ b/build/fbcode_builder/manifests/llvm
@@ -0,0 +1,5 @@
+[manifest]
+name = llvm
+
+[rpms]
+llvm15-devel