lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-07 07:02:53 +03:00
Code Activity

attempt to specify boost to build with clang - take 2

Browse Source 
Summary:
Original commit changeset: c6f013565680

Redo D22417488 (c22b8fcfce), with D22577887 fixing open source CI builds

Reviewed By: wez

Differential Revision: D22577884

fbshipit-source-id: 0c94483e05715493859d29bc2b58f0847a95826b
This commit is contained in:
Zeyi (Rice) Fan
2020-07-26 15:01:03 -07:00
committed by Facebook GitHub Bot
parent f56a96d1f1
commit ba88d5d42e
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/fbcode_builder/getdeps/builder.py
View File

@@ -802,8 +802,16 @@ class Boost(BuilderBase):
linkage = ["static"] linkage = ["static"]
if self.build_opts.is_windows(): if self.build_opts.is_windows():
linkage.append("shared") 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: for link in linkage:
args = []
if self.build_opts.is_windows(): if self.build_opts.is_windows():
bootstrap = os.path.join(self.src_dir, "bootstrap.bat") bootstrap = os.path.join(self.src_dir, "bootstrap.bat")
self._run_cmd([bootstrap], cwd=self.src_dir) self._run_cmd([bootstrap], cwd=self.src_dir)

3
build/fbcode_builder/manifests/boost
View File

@@ -81,3 +81,6 @@ builder = boost
--with-timer --with-timer
--with-type_erasure --with-type_erasure
--with-wave --with-wave
[b2.args.os=darwin]
toolset=clang