Merge remote-tracking branch 'upstream/master' into fix25

This commit is contained in:
proller 2019-06-28 20:23:31 +03:00
commit 042862a54c

View File

@ -40,7 +40,7 @@ sudo apt-get install git cmake ninja-build
Or cmake3 instead of cmake on older systems. Or cmake3 instead of cmake on older systems.
## Install GCC 7 ## Install GCC 8
There are several ways to do this. There are several ways to do this.
@ -50,18 +50,18 @@ There are several ways to do this.
sudo apt-get install software-properties-common sudo apt-get install software-properties-common
sudo apt-add-repository ppa:ubuntu-toolchain-r/test sudo apt-add-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get install gcc-7 g++-7 sudo apt-get install gcc-8 g++-8
``` ```
### Install from Sources ### Install from Sources
Look at [ci/build-gcc-from-sources.sh](https://github.com/yandex/ClickHouse/blob/master/ci/build-gcc-from-sources.sh) Look at [ci/build-gcc-from-sources.sh](https://github.com/yandex/ClickHouse/blob/master/ci/build-gcc-from-sources.sh)
## Use GCC 7 for Builds ## Use GCC 8 for Builds
```bash ```bash
export CC=gcc-7 export CC=gcc-8
export CXX=g++-7 export CXX=g++-8
``` ```
## Install Required Libraries from Packages ## Install Required Libraries from Packages