facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

getdeps: fix fbthrift build

Browse Source 
Summary: D6161089 removes autoconf support in fbthrift. So let's switch to cmake.

Reviewed By: wez

Differential Revision: D6675252

fbshipit-source-id: 5d04d3e285f80aec4ce3b566c5046c6f2c3d76b1
This commit is contained in:
Jun Wu 2018-01-08 11:51:44 -08:00 committed by Facebook Github Bot
parent 453f3aa507
commit b7ecbd667f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
getdeps.py
View File

@ -162,25 +162,21 @@ def WangleBuilder(opts):
def FbthriftBuilder(opts):
include_dirs = [
opts.project_dir('folly'),
opts.project_dir('wangle'),
opts.project_dir('mstch', 'include'),
opts.project_dir('zstd', 'lib'),
]
lib_dirs = [
opts.project_dir('folly', 'folly/.libs'),
opts.project_dir('wangle', 'wangle/build/lib'),
opts.project_dir('mstch', 'build/src'),
opts.project_dir('zstd', 'lib'),
]
inc_flags = [shellquote('-I' + path) for path in include_dirs]
libdir_flags = [shellquote('-L' + path) for path in lib_dirs]
make_env = {
'CPPFLAGS': ' '.join(inc_flags),
cmake_env = {
'FOLLY_INCLUDE_DIR': opts.project_dir('folly'),
'MSTCH_INCLUDE_DIRS': opts.project_dir('mstch', 'include'),
'WANGLE_INCLUDE_DIRS': opts.project_dir('wangle'),
'ZSTD_INCLUDE_DIRS': opts.project_dir('zstd', 'lib'),
'LDFLAGS': ' '.join(libdir_flags),
}
return AutoconfBuilder(subdir='thrift', env=make_env)
return CMakeBuilder(subdir='thrift', env=cmake_env)
def get_projects(opts):