File tree 4 files changed +5
-4
lines changed
dist-i586-gnu-i586-i686-musl
4 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -18,10 +18,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
18
18
19
19
WORKDIR /build/
20
20
COPY scripts/musl.sh /build/
21
- RUN CC=gcc CFLAGS="-m32 -fPIC - Wa,-mrelax-relocations=no" \
21
+ RUN CC=gcc CFLAGS="-m32 -Wa,-mrelax-relocations=no" \
22
22
CXX=g++ CXXFLAGS="-m32 -Wa,-mrelax-relocations=no" \
23
23
bash musl.sh i686 --target=i686 && \
24
- CC=gcc CFLAGS="-march=pentium -m32 -fPIC - Wa,-mrelax-relocations=no" \
24
+ CC=gcc CFLAGS="-march=pentium -m32 -Wa,-mrelax-relocations=no" \
25
25
CXX=g++ CXXFLAGS="-march=pentium -m32 -Wa,-mrelax-relocations=no" \
26
26
bash musl.sh i586 --target=i586 && \
27
27
rm -rf /build
Original file line number Diff line number Diff line change @@ -89,7 +89,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
89
89
CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft"
90
90
91
91
ENV RUST_CONFIGURE_ARGS \
92
- --enable-extended \
93
92
--target=$TARGETS \
94
93
--musl-root-arm=/musl-arm \
95
94
--musl-root-armhf=/musl-armhf \
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ WORKDIR /build/
21
21
COPY scripts/musl.sh /build/
22
22
# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
23
23
RUN CC=gcc \
24
- CFLAGS="-fPIC - Wa,-mrelax-relocations=no" \
24
+ CFLAGS="-Wa,-mrelax-relocations=no" \
25
25
CXX=g++ \
26
26
CXXFLAGS="-Wa,-mrelax-relocations=no" \
27
27
bash musl.sh x86_64 && rm -rf /build
Original file line number Diff line number Diff line change 30
30
TAG=$1
31
31
shift
32
32
33
+ export CFLAGS=" -fPIC $CFLAGS "
34
+
33
35
MUSL=musl-1.1.18
34
36
35
37
# may have been downloaded in a previous run
You can’t perform that action at this time.
0 commit comments