Skip to content

Commit 5ae8838

Browse files
committed
dist-x86_64-linux: for gcc add --disable-multilib, as there no need to build 32-bit. Remove linked 32-bit libraries, dist-i686-linux have it's own build-gcc.sh
1 parent a1610e3 commit 5ae8838

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@ cd ../gcc-build
3030
hide_output ../gcc-$GCC/configure \
3131
--prefix=/rustroot \
3232
--enable-languages=c,c++ \
33-
--disable-gnu-unique-object
33+
--disable-gnu-unique-object \
34+
--disable-multilib
3435
hide_output make -j$(nproc)
3536
hide_output make install
3637
ln -s gcc /rustroot/bin/cc
3738

3839
cd ..
3940
rm -rf gcc-build
4041
rm -rf gcc-$GCC
41-
42-
# FIXME: clang doesn't find 32-bit libraries in /rustroot/lib,
43-
# but it does look all the way under /rustroot/lib/[...]/32,
44-
# so we can link stuff there to help it out.
45-
ln /rustroot/lib/*.{a,so} -rst /rustroot/lib/gcc/x86_64-pc-linux-gnu/$GCC/32/

0 commit comments

Comments
 (0)