diff options
| author | Nikita Mikhaylov <mikhaylovnikitka@gmail.com> | 2021-09-29 12:17:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 10:17:46 +0100 |
| commit | ab547f18819b8a568dc9ce5c7dd1460fb87d56fc (patch) | |
| tree | a3b01d21003fa98a3180049dfe2e8e4ddf49a070 | |
| parent | b3577655f24f2f86c1e99992eb594c6316ea1ce5 (diff) | |
| download | oss-fuzz-ab547f18819b8a568dc9ce5c7dd1460fb87d56fc.tar.gz | |
Done (#6536)
| -rw-r--r-- | projects/clickhouse/Dockerfile | 7 | ||||
| -rwxr-xr-x | projects/clickhouse/build.sh | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/projects/clickhouse/Dockerfile b/projects/clickhouse/Dockerfile index ad7f46980..cd835bea1 100644 --- a/projects/clickhouse/Dockerfile +++ b/projects/clickhouse/Dockerfile @@ -34,12 +34,7 @@ RUN apt-get update -y \ sudo \ tzdata - -RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-Linux-x86_64.sh; \ - chmod +x cmake-3.21.1-Linux-x86_64.sh; \ - ./cmake-3.21.1-Linux-x86_64.sh --skip-license --prefix="/usr" - -RUN git clone --recursive https://github.com/ClickHouse/ClickHouse $SRC/ClickHouse +RUN git clone -j 8 --recursive https://github.com/ClickHouse/ClickHouse $SRC/ClickHouse WORKDIR $SRC/ClickHouse COPY build.sh $SRC/ diff --git a/projects/clickhouse/build.sh b/projects/clickhouse/build.sh index 998cd3625..a0415f085 100755 --- a/projects/clickhouse/build.sh +++ b/projects/clickhouse/build.sh @@ -47,12 +47,11 @@ CLICKHOUSE_CMAKE_FLAGS=( "-DENABLE_SSL=1" "-DUSE_INTERNAL_SSL_LIBRARY=1" "-DUSE_UNWIND=ON" + "-DGLIBC_COMPATIBILITY=OFF" ) if [ "$SANITIZER" = "coverage" ]; then - cmake -G Ninja $SRC/ClickHouse ${CLICKHOUSE_CMAKE_FLAGS[@]} -DCMAKE_CXX_FLAGS="$CXXFLAGS" -DCMAKE_C_FLAGS="$CFLAGS" -elif [ "$SANITIZER" = "undefined" ]; then - cmake -G Ninja $SRC/ClickHouse ${CLICKHOUSE_CMAKE_FLAGS[@]} -DCMAKE_CXX_FLAGS="$CXXFLAGS" -DCMAKE_C_FLAGS="$CFLAGS" -DSANITIZE=$SANITIZER + cmake -G Ninja $SRC/ClickHouse ${CLICKHOUSE_CMAKE_FLAGS[@]} -DCMAKE_CXX_FLAGS="$CXXFLAGS" -DCMAKE_C_FLAGS="$CFLAGS" -DWITH_COVERAGE=1 else cmake -G Ninja $SRC/ClickHouse ${CLICKHOUSE_CMAKE_FLAGS[@]} -DCMAKE_CXX_FLAGS="$CXXFLAGS" -DCMAKE_C_FLAGS="$CFLAGS" -DWITH_COVERAGE=1 -DSANITIZE=$SANITIZER fi |