Skip to content

Commit f258b50

Browse files
authored
Merge pull request ClickHouse#79575 from azat/fix-gdb-v3
cctools: do not rely on gdb location for debug symbols
2 parents 5a62904 + cf7b989 commit f258b50

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

ci/docker/binary-builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV CC=clang-${LLVM_VERSION}
55
ENV CXX=clang++-${LLVM_VERSION}
66

77
# If the cctools is updated, then first build it in the CI, then update here in a different commit
8-
COPY --from=clickhouse/cctools:a551cc7348883028fb53 /cctools /cctools
8+
COPY --from=clickhouse/cctools:4670e95dde3de689f103 /cctools /cctools
99

1010
# A cross-linker for RISC-V 64 (we need it, because LLVM's LLD does not work):
1111
RUN apt-get update \

ci/docker/fasttest/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ RUN apt-get update \
6767
&& apt-get clean \
6868
&& rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
6969

70-
COPY --from=clickhouse/cctools:a551cc7348883028fb53 /opt/gdb /opt/gdb
70+
COPY --from=clickhouse/cctools:4670e95dde3de689f103 /opt/gdb /opt/gdb
7171
# Give suid to gdb to grant it attach permissions
7272
RUN chmod u+s /opt/gdb/bin/gdb
7373
ENV PATH="/opt/gdb/bin:${PATH}"

docker/packager/cctools/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ RUN apt-get update \
5353
RUN wget https://sourceware.org/pub/gdb/releases/gdb-$GDB_VERSION.tar.gz \
5454
&& tar -xvf gdb-$GDB_VERSION.tar.gz \
5555
&& cd gdb-$GDB_VERSION \
56-
&& ./configure --prefix=/usr \
56+
&& ./configure --prefix=/opt/gdb --with-separate-debug-dir=/usr/lib/debug \
5757
&& make -j $(nproc) \
58-
&& make install DESTDIR=/opt/gdb \
58+
&& make install \
5959
&& rm -fr gdb-$GDB_VERSION gdb-$GDB_VERSION.tar.gz
6060

6161
# just in case

docker/test/integration/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,5 @@ maxClientCnxns=80' > /opt/zookeeper/conf/zoo.cfg && \
7373
ENV TZ=Etc/UTC
7474
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
7575

76-
COPY --from=clickhouse/cctools:a551cc7348883028fb53 /opt/gdb /opt/gdb
76+
COPY --from=clickhouse/cctools:4670e95dde3de689f103 /opt/gdb /opt/gdb
7777
ENV PATH="/opt/gdb/bin:${PATH}"

docker/test/integration/runner/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ COPY modprobe.sh /usr/local/bin/modprobe
8686
COPY dockerd-entrypoint.sh /usr/local/bin/
8787
COPY misc/ /misc/
8888

89-
COPY --from=clickhouse/cctools:a551cc7348883028fb53 /opt/gdb /opt/gdb
89+
COPY --from=clickhouse/cctools:4670e95dde3de689f103 /opt/gdb /opt/gdb
9090
ENV PATH="/opt/gdb/bin:${PATH}"
9191

9292
# Same options as in test/base/Dockerfile

docker/test/performance-comparison/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN mkdir /fg && cd /fg \
4747

4848
COPY run.sh /
4949

50-
COPY --from=clickhouse/cctools:a551cc7348883028fb53 /opt/gdb /opt/gdb
50+
COPY --from=clickhouse/cctools:4670e95dde3de689f103 /opt/gdb /opt/gdb
5151
ENV PATH="/opt/gdb/bin:${PATH}"
5252

5353
CMD ["bash", "/run.sh"]

docker/test/util/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ RUN apt-get update \
8080
&& apt-get clean \
8181
&& rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
8282

83-
COPY --from=clickhouse/cctools:a551cc7348883028fb53 /opt/gdb /opt/gdb
83+
COPY --from=clickhouse/cctools:4670e95dde3de689f103 /opt/gdb /opt/gdb
8484
ENV PATH="/opt/gdb/bin:${PATH}"

0 commit comments

Comments
 (0)