From ba88d5d42e95084ce68fce2ecc53d3a5df1d57ff Mon Sep 17 00:00:00 2001
From: "Zeyi (Rice) Fan" <zeyi@fb.com>
Date: Sun, 26 Jul 2020 15:01:03 -0700
Subject: [PATCH] attempt to specify boost to build with clang - take 2

Summary:
Original commit changeset: c6f013565680

Redo D22417488 (https://github.com/facebook/proxygen/commit/c22b8fcfcec9ffa525d4af7483f7ab753a9a8e9f), with D22577887 fixing open source CI builds

Reviewed By: wez

Differential Revision: D22577884

fbshipit-source-id: 0c94483e05715493859d29bc2b58f0847a95826b
---
 build/fbcode_builder/getdeps/builder.py | 10 +++++++++-
 build/fbcode_builder/manifests/boost    |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

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