about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-11-11 19:37:31 +0000
committerbors <bors@rust-lang.org>2020-11-11 19:37:31 +0000
commit5404efc28a0cddee103ef6396c48ea71ff9631c8 (patch)
treeebdb66dc361925dbcc99745a1c14a158edc3119c /src
parent7afc5172305cdae588a0318ce545749cf4ed947d (diff)
parentd2ad47269b7d395dede9d8bcc9c4f11062eb919c (diff)
downloadrust-5404efc28a0cddee103ef6396c48ea71ff9631c8.tar.gz
rust-5404efc28a0cddee103ef6396c48ea71ff9631c8.zip
Auto merge of #78946 - jethrogb:linux-x86-llvm-no-gnu-unique, r=Mark-Simulacrum
Linux dist: don't include unique symbols in libLLVM

Fixes #76980
Diffstat (limited to 'src')
-rwxr-xr-xsrc/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh
index 9d7461ebee3..fcf869b68be 100755
--- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh
+++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh
@@ -29,7 +29,8 @@ mkdir ../gcc-build
 cd ../gcc-build
 hide_output ../gcc-$GCC/configure \
     --prefix=/rustroot \
-    --enable-languages=c,c++
+    --enable-languages=c,c++ \
+    --disable-gnu-unique-object
 hide_output make -j10
 hide_output make install
 ln -s gcc /rustroot/bin/cc