mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-10 01:25:21 +00:00
Merge pull request #6333 from NanoBjorn/docker-builder-gcc-9
Added gcc-9 to docker/builder container
This commit is contained in:
commit
922cbe98c9
@ -1,6 +1,8 @@
|
||||
FROM ubuntu:18.04
|
||||
|
||||
RUN apt-get update -y \
|
||||
&& apt-get install -y software-properties-common \
|
||||
&& add-apt-repository ppa:ubuntu-toolchain-r/test \
|
||||
&& env DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get install --yes --no-install-recommends \
|
||||
bash \
|
||||
@ -8,8 +10,8 @@ RUN apt-get update -y \
|
||||
cmake \
|
||||
curl \
|
||||
expect \
|
||||
g++ \
|
||||
gcc \
|
||||
g++-9 \
|
||||
gcc-9 \
|
||||
libclang-6.0-dev \
|
||||
libicu-dev \
|
||||
liblld-6.0-dev \
|
||||
|
@ -3,7 +3,7 @@
|
||||
#ccache -s
|
||||
mkdir -p /server/build_docker
|
||||
cd /server/build_docker
|
||||
cmake -G Ninja /server -DENABLE_TESTS=1
|
||||
cmake -G Ninja /server -DENABLE_TESTS=1 -DCMAKE_C_COMPILER=`which gcc-9` -DCMAKE_CXX_COMPILER=`which g++-9`
|
||||
|
||||
# Set the number of build jobs to the half of number of virtual CPU cores (rounded up).
|
||||
# By default, ninja use all virtual CPU cores, that leads to very high memory consumption without much improvement in build time.
|
||||
|
Loading…
Reference in New Issue
Block a user