From 27f59ce8322f8abcd838802df08617cef48631ff Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 7 Feb 2024 16:31:33 +0000 Subject: [PATCH 1/2] double default stack size --- .cargo/config.toml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index a38223d24f380..f42f8a87367f9 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -7,9 +7,15 @@ rustdocflags = [] [target.x86_64-pc-windows-msvc] linker = "rust-lld" -rustflags = ["-C", "target-feature=+crt-static"] +rustflags = [ + "-C", "target-feature=+crt-static", + "-C", "link-args=-Wl,-zstack-size=4194304", +] [target.i686-pc-windows-msvc] -rustflags = ["-C", "target-feature=+crt-static"] +rustflags = [ + "-C", "target-feature=+crt-static", + "-C", "link-args=-Wl,-zstack-size=4194304", +] [target.aarch64-unknown-linux-gnu] linker = "aarch64-linux-gnu-gcc" @@ -20,6 +26,7 @@ rustflags = [ "--cfg", "tokio_unstable", "-Zshare-generics=y", + "-C", "link-args=-Wl,-zstack-size=4194304", "-Csymbol-mangling-version=v0", "-Ctarget-feature=-crt-static", "-Clink-arg=-lgcc", @@ -33,5 +40,6 @@ rustflags = [ "--cfg", "tokio_unstable", "-Zshare-generics=y", + "-C", "link-args=-Wl,-zstack-size=4194304", "-Csymbol-mangling-version=v0", ] From 9078062eb6bfe3248629828ced1debd08e9fcfdd Mon Sep 17 00:00:00 2001 From: OJ Kwon <1210596+kwonoj@users.noreply.github.com.> Date: Wed, 7 Feb 2024 09:18:38 -0800 Subject: [PATCH 2/2] build(cargo): exclude wasm from linker config --- .cargo/config.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index f42f8a87367f9..b34cf4f1710ed 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -35,11 +35,15 @@ rustflags = [ [target.armv7-unknown-linux-gnueabihf] linker = "arm-linux-gnueabihf-gcc" +[target.'any(not(target.wasm32-unknown-unknown), not(wasm32-wasi-preview1-threads))'] +rustflags = [ + "-C", "link-args=-Wl,-zstack-size=4194304", +] + [target.'cfg(all())'] rustflags = [ "--cfg", "tokio_unstable", "-Zshare-generics=y", - "-C", "link-args=-Wl,-zstack-size=4194304", "-Csymbol-mangling-version=v0", ]