Skip to content

Commit 0b6a220

Browse files
committed
Update folly recipe
Signed-off-by: yhmo <yihua.mo@zilliz.com>
1 parent 995312d commit 0b6a220

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

recipes/folly/v2026/conanfile.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,14 @@ def _patch_sources(self):
219219
rm(self, "Find*.cmake", os.path.join(self.source_folder, "CMake"))
220220
rm(self, "Find*.cmake", os.path.join(self.source_folder, "build", "fbcode_builder", "CMake"))
221221
# Skip generating .pc file to avoid Windows errors when trying to compile with pkg-config
222-
replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"), "gen_pkgconfig_vars(FOLLY_PKGCONFIG folly_deps)", "")
222+
cmakelists = os.path.join(self.source_folder, "CMakeLists.txt")
223+
replace_in_file(self, cmakelists, "gen_pkgconfig_vars(FOLLY_PKGCONFIG folly_deps)", "")
224+
replace_in_file(
225+
self,
226+
cmakelists,
227+
"project(${PACKAGE_NAME} CXX C ASM)",
228+
'project(${PACKAGE_NAME} CXX C ASM)\nset(CMAKE_ASM_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}")',
229+
)
223230

224231
def build(self):
225232
self._patch_sources()

0 commit comments

Comments
 (0)