Skip to content

Commit

Permalink
Back out "fix boost macOS build with new Xcode" (#27)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: facebook/sapling#27

Pull Request resolved: facebookexperimental/rust-shed#9

Original diffs: D22417488 (43d80f1), D22528869 (3930a6e)

Reviewed By: markbt

Differential Revision: D22571972

fbshipit-source-id: c6f013565680a757b642dd79e647207fce3351ec
  • Loading branch information
lukaspiatkowski authored and facebook-github-bot committed Jul 16, 2020
1 parent 818b7ab commit 6bc436a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
10 changes: 1 addition & 9 deletions build/fbcode_builder/getdeps/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -802,16 +802,8 @@ 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)
Expand Down
3 changes: 0 additions & 3 deletions build/fbcode_builder/manifests/boost
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,3 @@ builder = boost
--with-timer
--with-type_erasure
--with-wave

[b2.args.os=darwin]
toolset=clang

0 comments on commit 6bc436a

Please sign in to comment.