mirror of
https://github.com/facebook/sapling.git
synced 2024-12-27 06:52:23 +03:00
Back out "fix boost macOS build with new Xcode" (#27)
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 (ad89d50a79
), D22528869 (b3c9a79f30
) Reviewed By: markbt Differential Revision: D22571972 fbshipit-source-id: c6f013565680a757b642dd79e647207fce3351ec
This commit is contained in:
parent
ae4b55ccaf
commit
d323203d86
@ -802,16 +802,8 @@ 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)
|
||||
|
@ -81,6 +81,3 @@ builder = boost
|
||||
--with-timer
|
||||
--with-type_erasure
|
||||
--with-wave
|
||||
|
||||
[b2.args.os=darwin]
|
||||
toolset=clang
|
||||
|
Loading…
Reference in New Issue
Block a user