Skip to content

Commit

Permalink
ci: build external deps with BUILD_DISTINCT=1. (#722)
Browse files Browse the repository at this point in the history
This is needed for #716, it's going to temporarily increase the CI image size, but this will go away
when we remove the need for cmake.
  • Loading branch information
htuch authored and mattklein123 committed Apr 8, 2017
1 parent 29bd95b commit 2e6b853
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions ci/build_container/build_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,10 @@ export CXX=g++-4.9
export THIRDPARTY_DEPS=/tmp
export THIRDPARTY_SRC=/thirdparty
export THIRDPARTY_BUILD=/thirdparty_build
# TODO(htuch): Remove the first build of the libraries in non-distinct locations when cmake is gone.
# Below we now build/install twice and this requires 2x the space in the Docker image as is to
# support both Bazel and cmake, but it's not worth fixing up all the cmake stuff since it's going
# soon.
"$(dirname "$0")"/build_and_install_deps.sh
rm -f /tmp/*.dep
BUILD_DISTINCT=1 "$(dirname "$0")"/build_and_install_deps.sh

0 comments on commit 2e6b853

Please sign in to comment.