Skip to content

Commit

Permalink
Fix fbthrift build in setup-*.sh (facebookincubator#9204)
Browse files Browse the repository at this point in the history
Summary:
In the new fbthrift version from facebookincubator#8950  a command fails if `BUILD_SHARED_LIBS` is not explicitly set (because its empty by default).  This PR explicitly sets BUILD_SHARED_LIBS when building fbthrift and also uses the correct flag to disable tests in addition to the default cmake one.

Pull Request resolved: facebookincubator#9204

Reviewed By: kevinwilfong

Differential Revision: D55337270

Pulled By: pedroerp

fbshipit-source-id: 6d77d10e5a1ed0379f52177edf8753246b1e8a6e
  • Loading branch information
assignUser authored and facebook-github-bot committed Mar 26, 2024
1 parent c4f3225 commit 3aa020d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/setup-centos8.sh
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function install_fbthrift {
wget_and_untar https://github.com/facebook/fbthrift/archive/refs/tags/${FB_OS_VERSION}.tar.gz fbthrift
(
cd fbthrift
cmake_install -Denable_tests=OFF
cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
)
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function install_mvfst {

function install_fbthrift {
github_checkout facebook/fbthrift "${FB_OS_VERSION}"
cmake_install -DBUILD_TESTS=OFF
cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
}

function install_double_conversion {
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function install_mvfst {

function install_fbthrift {
github_checkout facebook/fbthrift "${FB_OS_VERSION}"
cmake_install -DBUILD_TESTS=OFF
cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
}

function install_conda {
Expand Down

0 comments on commit 3aa020d

Please sign in to comment.