Skip to content

Commit 8306c37

Browse files
committed
build: remove dependency on modified folly repository
Currently we pull a modified folly repository to be able to use it header only. The only difference in this repository is adding the `folly-config.h` file. Pull this patch into this repo instead and use upstream folly. Bump folly to latest main as well. Test plan: - CI build. I have local build issues at the moment.
1 parent 8d83ae1 commit 8306c37

File tree

2 files changed

+457
-2
lines changed

2 files changed

+457
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,10 @@ include_directories(SYSTEM "${rocksdb_SOURCE_DIR}/include")
8989
### use folly as a header only library. some features won't be supported.
9090
FetchContent_Declare(
9191
folly
92-
GIT_REPOSITORY https://github.com/JakeHillion/folly.git
93-
GIT_TAG 8db54418e3ccdd97619ac8b69bb3702f82bb0f66
92+
GIT_REPOSITORY https://github.com/facebook/folly.git
93+
GIT_TAG c5aa5c46291a27f69acc920894d43605ceb43eba
9494
GIT_PROGRESS TRUE
95+
PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/extern/shim-folly-config.h folly/folly-config.h
9596
)
9697
FetchContent_Populate(folly)
9798

0 commit comments

Comments
 (0)