Skip to content

Commit

Permalink
Revert "Fix static linking of unwind crates"
Browse files Browse the repository at this point in the history
This reverts commit dfdafda.
  • Loading branch information
Bownairo committed Oct 16, 2024
1 parent 73df60a commit cd1b4f7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
13 changes: 1 addition & 12 deletions ci/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN curl -fsSL https://github.com/honeycombio/buildevents/releases/download/v${b
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
apt -yq update && \
apt -yqq install --no-install-recommends docker-ce-cli podman containernetworking-plugins buildah zip fuse-overlayfs xtail libtool
apt -yqq install --no-install-recommends docker-ce-cli podman containernetworking-plugins buildah zip fuse-overlayfs xtail

# install afl & gsutils deps for bazel-fuzzers
RUN curl -L "https://apt.llvm.org/llvm-snapshot.gpg.key" | apt-key add - && \
Expand Down Expand Up @@ -61,17 +61,6 @@ RUN mkdir libtinfo && \
cd .. && \
rm -rf libtinfo

# Build libunwind from source. The packaged version breaks linking
# Depends on libtool above
RUN git clone --branch v1.8.1 --depth 1 "https://github.com/libunwind/libunwind" && \
cd libunwind && \
autoreconf -i && \
./configure --libdir=/lib/x86_64-linux-gnu --includedir=/usr/include/x86_64-linux-gnu --disable-tests && \
make && \
make install && \
cd .. && \
rm -rf libunwind

ARG sdk_version=0.12.0
ARG sdk_sha=40da56ad27774d5e1b2cbc35f94c17368be8c8da557aca19878940264bd82a0a
RUN mkdir -p /tmp/sdk && curl -fsSL https://github.com/dfinity/sdk/releases/download/${sdk_version}/dfx-${sdk_version}-x86_64-linux.tar.gz -o /tmp/sdk/dfx.tar.gz && \
Expand Down
1 change: 1 addition & 0 deletions ci/container/files/packages.common
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ gcc
lld
pkg-config
libssl-dev
libunwind-dev
libusb-1.0-0-dev
libsqlite3-dev
zlib1g-dev
Expand Down

0 comments on commit cd1b4f7

Please sign in to comment.