From fe327aaade86556e861cc2e28cb434e586c01e64 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Sat, 22 May 2021 17:54:06 +0100 Subject: [PATCH 1/3] folly: build on Mojave --- Formula/folly.rb | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Formula/folly.rb b/Formula/folly.rb index 127202f5a6f39..9d2f4db776798 100644 --- a/Formula/folly.rb +++ b/Formula/folly.rb @@ -21,14 +21,29 @@ class Folly < Formula depends_on "glog" depends_on "libevent" depends_on "lz4" - # https://github.com/facebook/folly/issues/1545 - depends_on macos: :catalina depends_on "openssl@1.1" depends_on "snappy" depends_on "xz" depends_on "zstd" + on_macos do + depends_on "llvm" if DevelopmentTools.clang_build_version <= 1100 + end + + fails_with :clang do + build 1100 + # https://github.com/facebook/folly/issues/1545 + cause <<-EOS + Undefined symbols for architecture x86_64: + "std::__1::__fs::filesystem::path::lexically_normal() const" + EOS + end + def install + on_macos do + ENV.llvm_clang if DevelopmentTools.clang_build_version <= 1100 + end + mkdir "_build" do args = std_cmake_args + %w[ -DFOLLY_USE_JEMALLOC=OFF @@ -46,6 +61,9 @@ def install end test do + # Force use of Clang rather than LLVM Clang + on_macos { ENV.clang } + (testpath/"test.cc").write <<~EOS #include int main() { From 4067e2e19d6283cf21c8e82ba0442de49a1f953c Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Sat, 22 May 2021 20:20:58 +0100 Subject: [PATCH 2/3] fizz: build on Mojave This was previously blocked by `folly` not building on Mojave, but no longer. --- Formula/fizz.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/Formula/fizz.rb b/Formula/fizz.rb index 8f21e95c484b5..2accf81271581 100644 --- a/Formula/fizz.rb +++ b/Formula/fizz.rb @@ -22,8 +22,6 @@ class Fizz < Formula depends_on "libevent" depends_on "libsodium" depends_on "lz4" - # https://github.com/facebook/folly/issues/1545 - depends_on macos: :catalina depends_on "openssl@1.1" depends_on "snappy" depends_on "zstd" From 6f3e1dea1d0cb12d4daeb7f562ce99a9f7b28056 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Sat, 22 May 2021 22:55:24 +0100 Subject: [PATCH 3/3] wangle: build on Mojave This was previously blocked by `folly` not building on Mojave, but no longer. --- Formula/wangle.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/Formula/wangle.rb b/Formula/wangle.rb index 98a105275762e..cd90451a1c171 100644 --- a/Formula/wangle.rb +++ b/Formula/wangle.rb @@ -23,8 +23,6 @@ class Wangle < Formula depends_on "libevent" depends_on "libsodium" depends_on "lz4" - # https://github.com/facebook/folly/issues/1545 - depends_on macos: :catalina depends_on "openssl@1.1" depends_on "snappy" depends_on "zstd"