diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index b7bb769bd..3ed744bba 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -802,8 +802,16 @@ class Boost(BuilderBase): 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) diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index f051cfd1b..4b254e308 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -81,3 +81,6 @@ builder = boost --with-timer --with-type_erasure --with-wave + +[b2.args.os=darwin] +toolset=clang