From a8ca678c84f148aaa9689475cc26679cb7bbc866 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Sat, 1 Jun 2024 08:15:42 -0700 Subject: [PATCH] Add a flag only_install to omit the plain `make` step Summary: X-link: https://github.com/facebookincubator/zstrong/pull/849 Needed for installing ghc binaries, which have an autoconf-based distribution that only supports `make install`, not `make`. Reviewed By: chadaustin Differential Revision: D58011865 fbshipit-source-id: db7c3cc45701201466a6b2853c5f3515b178fa74 --- build/fbcode_builder/getdeps/builder.py | 4 +++- build/fbcode_builder/getdeps/manifest.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 8de30f73e..2ff40aae1 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -362,7 +362,9 @@ class AutoconfBuilder(BuilderBase): self._run_cmd(["autoreconf", "-ivf"], cwd=self.src_dir, env=env) configure_cmd = [configure_path, "--prefix=" + self.inst_dir] + self.args self._run_cmd(configure_cmd, env=env) - self._run_cmd([self._make_binary, "-j%s" % self.num_jobs], env=env) + only_install = self.manifest.get("build", "only_install", "false", ctx=self.ctx) + if not only_install: + self._run_cmd([self._make_binary, "-j%s" % self.num_jobs], env=env) self._run_cmd([self._make_binary, "install"], env=env) diff --git a/build/fbcode_builder/getdeps/manifest.py b/build/fbcode_builder/getdeps/manifest.py index eab64c95b..16dac6b39 100644 --- a/build/fbcode_builder/getdeps/manifest.py +++ b/build/fbcode_builder/getdeps/manifest.py @@ -64,6 +64,7 @@ SCHEMA = { "subdir": OPTIONAL, "make_binary": OPTIONAL, "build_in_src_dir": OPTIONAL, + "only_install": OPTIONAL, "job_weight_mib": OPTIONAL, "patchfile": OPTIONAL, "patchfile_opts": OPTIONAL,