lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-05 19:55:47 +03:00
Code Activity

Only add direct deps to GETDEPS_CABAL_FLAGS

Browse Source 
Summary:
X-link: https://github.com/facebookincubator/zstrong/pull/899

You shouldn't be able to depend on a library unless it is in your direct dependencies, also this shortens the massive GETDEPS_CABAL_FLAGS to something more sensible.

Reviewed By: chadaustin

Differential Revision: D58244928

fbshipit-source-id: 3e93f26ef197252cd723a65c1752dad53b5327b6
This commit is contained in:
Simon Marlow
2024-07-02 09:32:47 -07:00
committed by Facebook GitHub Bot
parent 9bc0fc331e
commit 66f3fad54b
4 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/fbcode_builder/getdeps/builder.py
View File

@@ -179,7 +179,9 @@ class BuilderBase(object):
# needs to be updated to include all of the directories containing the runtime
# library dependencies in order to run the binaries.
script_path = self.get_dev_run_script_path()
dep_munger = create_dyn_dep_munger(self.build_opts, self.install_dirs)
dep_munger = create_dyn_dep_munger(
self.build_opts, self._compute_env(), self.install_dirs
)
dep_dirs = self.get_dev_run_extra_path_dirs(dep_munger)
# pyre-fixme[16]: Optional type has no attribute `emit_dev_run_script`.
dep_munger.emit_dev_run_script(script_path, dep_dirs)
@@ -227,7 +229,11 @@ class BuilderBase(object):
# CMAKE_PREFIX_PATH is only respected when passed through the
# environment, so we construct an appropriate path to pass down
return self.build_opts.compute_env_for_install_dirs(
self.install_dirs, env=self.env, manifest=self.manifest
self.loader,
self.dep_manifests,
self.ctx,
env=self.env,
manifest=self.manifest,
)
def get_dev_run_script_path(self):
@@ -237,7 +243,9 @@ class BuilderBase(object):
def get_dev_run_extra_path_dirs(self, dep_munger=None):
assert self.build_opts.is_windows()
if dep_munger is None:
dep_munger = create_dyn_dep_munger(self.build_opts, self.install_dirs)
dep_munger = create_dyn_dep_munger(
self.build_opts, self._compute_env(), self.install_dirs
)
return dep_munger.compute_dependency_paths(self.build_dir)