From 5615773803964b55d2a13ba6c790efa0930b9efe Mon Sep 17 00:00:00 2001 From: Shrikrishna Khare Date: Mon, 10 Jun 2019 18:18:27 -0700 Subject: [PATCH] fbcode_builder: getdeps: fboss: extend iproute2 builder to copy lib/* Summary: D15588809 introduced manifest and customer builder for iproute2. While the Iproute2Builder copies include/* from build to install directory, it does not copy lib/* which contains the libnetlink.a As a result, the build system looks up libnetlink.a on local machine (which it may not find). Fix it by explicitly coping lib/* as well. Reviewed By: wez Differential Revision: D15708835 fbshipit-source-id: 3f5906eb48ce982b6e887cca0d3c11314425beab --- build/fbcode_builder/getdeps/builder.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 733426605..49aa35927 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -225,11 +225,12 @@ class Iproute2Builder(BuilderBase): self._patch() self._run_cmd(["make", "-j%s" % self.build_opts.num_jobs], env=env) install_cmd = ["make", "install", "DESTDIR=" + self.inst_dir] - if not os.path.isdir(os.path.join(self.inst_dir, "include")): - shutil.copytree( - os.path.join(self.build_dir, "include"), - os.path.join(self.inst_dir, "include"), - ) + + for d in ["include", "lib"]: + if not os.path.isdir(os.path.join(self.inst_dir, d)): + shutil.copytree( + os.path.join(self.build_dir, d), os.path.join(self.inst_dir, d) + ) self._run_cmd(install_cmd, env=env)