lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-07 07:02:53 +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

22
build/fbcode_builder/getdeps/dyndeps.py
View File

@@ -26,9 +26,9 @@ def copyfile(src, dest) -> None:
class DepBase(object):
def __init__(self, buildopts, install_dirs, strip) -> None:
def __init__(self, buildopts, env, install_dirs, strip) -> None:
self.buildopts = buildopts
self.env = buildopts.compute_env_for_install_dirs(install_dirs)
self.env = env
self.install_dirs = install_dirs
self.strip = strip
@@ -168,8 +168,8 @@ class DepBase(object):
class WinDeps(DepBase):
def __init__(self, buildopts, install_dirs, strip) -> None:
super(WinDeps, self).__init__(buildopts, install_dirs, strip)
def __init__(self, buildopts, env, install_dirs, strip) -> None:
super(WinDeps, self).__init__(buildopts, env, install_dirs, strip)
self.dumpbin = self.find_dumpbin()
def find_dumpbin(self) -> str:
@@ -334,8 +334,8 @@ try {{
class ElfDeps(DepBase):
def __init__(self, buildopts, install_dirs, strip) -> None:
super(ElfDeps, self).__init__(buildopts, install_dirs, strip)
def __init__(self, buildopts, env, install_dirs, strip) -> None:
super(ElfDeps, self).__init__(buildopts, env, install_dirs, strip)
# We need patchelf to rewrite deps, so ensure that it is built...
args = [sys.executable, sys.argv[0]]
@@ -448,14 +448,14 @@ class MachDeps(DepBase):
def create_dyn_dep_munger(
buildopts, install_dirs, strip: bool = False
buildopts, env, install_dirs, strip: bool = False
) -> Optional[DepBase]:
if buildopts.is_linux():
return ElfDeps(buildopts, install_dirs, strip)
return ElfDeps(buildopts, env, install_dirs, strip)
if buildopts.is_darwin():
return MachDeps(buildopts, install_dirs, strip)
return MachDeps(buildopts, env, install_dirs, strip)
if buildopts.is_windows():
return WinDeps(buildopts, install_dirs, strip)
return WinDeps(buildopts, env, install_dirs, strip)
if buildopts.is_freebsd():
return ElfDeps(buildopts, install_dirs, strip)
return ElfDeps(buildopts, env, install_dirs, strip)
return None