Skip to content

Commit f364f48

Browse files
committed
Address final review
1 parent 17464a7 commit f364f48

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/ci/docker/scripts/musl-toolchain.sh

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# This script runs `musl-cross-make` to prepare C toolchain (Binutils, GCC, musl itself)
2+
# and builds static libunwind that we distribute for static target.
3+
#
4+
# Versions of the toolchain components are configurable in `musl-cross-make/Makefile` and
5+
# musl unlike GLIBC is forward compatible so upgrading it shouldn't break old distributions.
6+
# Right now we have: Binutils 2.27, GCC 6.3.0, musl 1.1.18
17
set -ex
28

39
hide_output() {

src/ci/docker/test-various/Dockerfile

+1-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1212
sudo \
1313
gdb \
1414
xz-utils \
15-
# for musl
1615
wget \
1716
patch
1817

@@ -25,9 +24,7 @@ RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \
2524

2625
WORKDIR /build/
2726
COPY scripts/musl-toolchain.sh /build/
28-
RUN CFLAGS="-Wa,-mrelax-relocations=no" \
29-
CXXFLAGS="-Wa,-mrelax-relocations=no" \
30-
bash musl-toolchain.sh x86_64 && rm -rf build
27+
RUN bash musl-toolchain.sh x86_64 && rm -rf build
3128
WORKDIR /
3229

3330
COPY scripts/sccache.sh /scripts/

0 commit comments

Comments
 (0)