From 2e6b853e2c4b7376aca7a76af5b61d557d78e627 Mon Sep 17 00:00:00 2001 From: htuch Date: Fri, 7 Apr 2017 20:43:34 -0400 Subject: [PATCH] ci: build external deps with BUILD_DISTINCT=1. (#722) 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. --- ci/build_container/build_container.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index 003fe7957bc4..c16baacf83c4 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -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