From ab019dbae2e3e6c856d6b3bbf06ac5a3332de3b7 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 31 Oct 2022 12:43:18 -0700 Subject: [PATCH] Remove folly-cmake-fixup.patch --- .../folly/patches/folly-cmake-fixup.patch | 17 ----------------- third-party/folly/patches/series | 1 - 2 files changed, 18 deletions(-) delete mode 100644 third-party/folly/patches/folly-cmake-fixup.patch diff --git a/third-party/folly/patches/folly-cmake-fixup.patch b/third-party/folly/patches/folly-cmake-fixup.patch deleted file mode 100644 index 79bdf1aa57fc8d..00000000000000 --- a/third-party/folly/patches/folly-cmake-fixup.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: folly/CMake/folly-deps.cmake -=================================================================== ---- folly.orig/CMake/folly-deps.cmake -+++ folly/CMake/folly-deps.cmake -@@ -185,6 +185,12 @@ set(FOLLY_HAVE_DWARF ${LIBDWARF_FOUND}) - if (NOT WIN32 AND NOT APPLE) - set(FOLLY_USE_SYMBOLIZER ON) - endif() -+if (NOT FOLLY_HAVE_ELF) -+ # Empty is falsey here, but ends up truthy in folly-config.h.cmake -+ set(FOLLY_HAVE_ELF OFF) -+ # The dwarf component depends on ELF -+ set(FOLLY_HAVE_DWARF OFF) -+endif() - message(STATUS "Setting FOLLY_USE_SYMBOLIZER: ${FOLLY_USE_SYMBOLIZER}") - message(STATUS "Setting FOLLY_HAVE_ELF: ${FOLLY_HAVE_ELF}") - message(STATUS "Setting FOLLY_HAVE_DWARF: ${FOLLY_HAVE_DWARF}") diff --git a/third-party/folly/patches/series b/third-party/folly/patches/series index a50f8704012df0..ddda2a5023f593 100644 --- a/third-party/folly/patches/series +++ b/third-party/folly/patches/series @@ -1,5 +1,4 @@ disable-liblzma.patch -folly-cmake-fixup.patch folly-install-component.patch disable-libsnappy.patch without-unwind-symbolizer.patch