Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 874d936

Browse files
Force mangling version for rustc_codegen_gcc
1 parent 77773fb commit 874d936

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/bootstrap/configure.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ def v(*args):
5959
o("use-libcxx", "llvm.use-libcxx", "build LLVM with libc++")
6060
o("control-flow-guard", "rust.control-flow-guard", "Enable Control Flow Guard")
6161
o("patch-binaries-for-nix", "build.patch-binaries-for-nix", "whether patch binaries for usage with Nix toolchains")
62+
o("new-symbol-mangling", "rust.new-symbol-mangling", "use symbol-mangling-version v0")
6263

6364
v("llvm-cflags", "llvm.cflags", "build LLVM with these extra compiler flags")
6465
v("llvm-cxxflags", "llvm.cxxflags", "build LLVM with these extra compiler flags")

src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ ENV RUST_CONFIGURE_ARGS \
5353
--build=x86_64-unknown-linux-gnu \
5454
--llvm-root=/usr/lib/llvm-15 \
5555
--enable-llvm-link-shared \
56-
--set rust.thin-lto-import-instr-limit=10
56+
--set rust.thin-lto-import-instr-limit=10 \
57+
--enable-new-symbol-mangling
5758

5859
COPY host-x86_64/x86_64-gnu-llvm-15/script.sh /tmp/
5960

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ RUN npm install -g browser-ui-test@$(head -n 1 /tmp/browser-ui-test.version) --u
8787

8888
ENV RUST_CONFIGURE_ARGS \
8989
--build=x86_64-unknown-linux-gnu \
90-
--save-toolstates=/tmp/toolstate/toolstates.json
90+
--save-toolstates=/tmp/toolstate/toolstates.json \
91+
--enable-new-symbol-mangling
9192

9293
ENV HOST_TARGET x86_64-unknown-linux-gnu
9394

0 commit comments

Comments
 (0)