From 968fc006f15633d84f7fcb91766309b5869ca67d Mon Sep 17 00:00:00 2001 From: "Zeyi (Rice) Fan" Date: Wed, 15 Jul 2020 10:19:10 -0700 Subject: [PATCH] teach getdeps to look for clang on macOS with xcrun in boost build Reviewed By: wez Differential Revision: D22528869 fbshipit-source-id: 66c394b6fafcc45503b593f9f6b0605b5578ce56 --- build/fbcode_builder/getdeps/builder.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 25c70b002..052669458 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -802,8 +802,16 @@ def _build(self, install_dirs, reconfigure): linkage = ["static"] if self.build_opts.is_windows(): linkage.append("shared") + + args = [] + if self.build_opts.is_darwin(): + clang = subprocess.check_output(["xcrun", "--find", "clang"]) + user_config = os.path.join(self.build_dir, "project-config.jam") + with open(user_config, "w") as jamfile: + jamfile.write("using clang : : %s ;\n" % clang.decode().strip()) + args.append("--user-config=%s" % user_config) + for link in linkage: - args = [] if self.build_opts.is_windows(): bootstrap = os.path.join(self.src_dir, "bootstrap.bat") self._run_cmd([bootstrap], cwd=self.src_dir)