Skip to content

Commit 6649f42

Browse files
committed
Build all of folly rather than patching out bits and pieces
1 parent d4cbab6 commit 6649f42

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

third-party/folly/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@ ExternalProject_add(
7373
-DZSTD_LIBRARY_RELEASE=${ZSTD_LIBRARY}
7474
BUILD_COMMAND
7575
$(MAKE) folly
76-
INSTALL_COMMAND
77-
# Prefered, but needs CMake 3.15 or above. Revist when Ubuntu 18.04 support is removed
78-
# ${CMAKE_COMMAND} --install . --config ${CMAKE_BUILD_TYPE} --component dev &&
79-
# ${CMAKE_COMMAND} --install . --config ${CMAKE_BUILD_TYPE} --component lib
80-
# Legacy way:
81-
${CMAKE_COMMAND} -DCOMPONENT=dev -P cmake_install.cmake --config ${CMAKE_BUILD_TYPE} &&
82-
${CMAKE_COMMAND} -DCOMPONENT=lib -P cmake_install.cmake --config ${CMAKE_BUILD_TYPE}
8376
)
8477
ExternalProject_Get_Property(bundled_folly INSTALL_DIR)
8578
set(

third-party/folly/patches/series

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
disable-liblzma.patch
22
folly-cmake-fixup.patch
3-
folly-install-component.patch
43
disable-libsnappy.patch
54
without-unwind-symbolizer.patch
6-
do-not-export-unbuilt-targets.patch
75
bad_implicit_cast.patch

0 commit comments

Comments
 (0)