From d323203d869fe922d4c7cf476d627fdcc6d3ad56 Mon Sep 17 00:00:00 2001 From: Lukas Piatkowski Date: Thu, 16 Jul 2020 06:34:35 -0700 Subject: [PATCH] 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 (https://github.com/facebookexperimental/eden/commit/ad89d50a79e0145f8713b545c0b3c1a6b0e6ed43), D22528869 (https://github.com/facebookexperimental/eden/commit/b3c9a79f30b74b1710e65ff73c692b0b14bcf9f7) Reviewed By: markbt Differential Revision: D22571972 fbshipit-source-id: c6f013565680a757b642dd79e647207fce3351ec --- build/fbcode_builder/getdeps/builder.py | 10 +--------- build/fbcode_builder/manifests/boost | 3 --- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 0526694587..25c70b0027 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -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) diff --git a/build/fbcode_builder/manifests/boost b/build/fbcode_builder/manifests/boost index 4b254e308a..f051cfd1b0 100644 --- a/build/fbcode_builder/manifests/boost +++ b/build/fbcode_builder/manifests/boost @@ -81,6 +81,3 @@ builder = boost --with-timer --with-type_erasure --with-wave - -[b2.args.os=darwin] -toolset=clang