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

Back out "fix boost macOS build with new Xcode" (#27)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebookexperimental/eden/pull/27

Pull Request resolved: https://github.com/facebookexperimental/rust-shed/pull/9

Original diffs: D22417488 (c22b8fcfce), D22528869 (9f01d017a5)

Reviewed By: markbt

Differential Revision: D22571972

fbshipit-source-id: c6f013565680a757b642dd79e647207fce3351ec
This commit is contained in:
Lukas Piatkowski
2020-07-16 06:34:35 -07:00
committed by Facebook GitHub Bot
parent 6dbad7c292
commit d6f17f0eb0
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -802,16 +802,8 @@ 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,6 +81,3 @@ builder = boost
--with-timer --with-timer
--with-type_erasure --with-type_erasure
--with-wave --with-wave
[b2.args.os=darwin]
toolset=clang