File tree Expand file tree Collapse file tree 4 files changed +5
-4
lines changed
dist-i586-gnu-i586-i686-musl Expand file tree Collapse file tree 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 \
1818
1919WORKDIR /build/
2020COPY 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" \
2222 CXX=g++ CXXFLAGS="-m32 -Wa,-mrelax-relocations=no" \
2323 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" \
2525 CXX=g++ CXXFLAGS="-march=pentium -m32 -Wa,-mrelax-relocations=no" \
2626 bash musl.sh i586 --target=i586 && \
2727 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 \
8989 CFLAGS_armv5te_unknown_linux_gnueabi="-march=armv5te -marm -mfloat-abi=soft"
9090
9191ENV RUST_CONFIGURE_ARGS \
92- --enable-extended \
9392 --target=$TARGETS \
9493 --musl-root-arm=/musl-arm \
9594 --musl-root-armhf=/musl-armhf \
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ WORKDIR /build/
2121COPY scripts/musl.sh /build/
2222# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
2323RUN CC=gcc \
24- CFLAGS="-fPIC - Wa,-mrelax-relocations=no" \
24+ CFLAGS="-Wa,-mrelax-relocations=no" \
2525 CXX=g++ \
2626 CXXFLAGS="-Wa,-mrelax-relocations=no" \
2727 bash musl.sh x86_64 && rm -rf /build
Original file line number Diff line number Diff line change 3030TAG=$1
3131shift
3232
33+ export CFLAGS=" -fPIC $CFLAGS "
34+
3335MUSL=musl-1.1.18
3436
3537# may have been downloaded in a previous run
You can’t perform that action at this time.
0 commit comments