Skip to content

Commit e6a5beb

Browse files
committed
Remove ucrt link logic
1 parent df2a6ed commit e6a5beb

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

.cargo/config.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[target.x86_64-pc-windows-msvc]
2+
rustflags = ["-C", "target-feature=+crt-static"]
3+
4+
[target.i686-pc-windows-msvc]
5+
rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,3 @@ jobs:
196196
yarn build --target ${{ matrix.settings.target }}
197197
yarn build --target ${{ matrix.settings.target }} --release
198198
fi
199-
- name: Build with static CRT
200-
if: ${{ matrix.settings.target == 'x86_64-pc-windows-msvc' }}
201-
working-directory: example
202-
run: yarn build --target ${{ matrix.settings.target }} --release
203-
env:
204-
RUSTFLAGS: "-C target-feature=+crt-static -C link-arg=/FORCE:MULTIPLE"

libmimalloc-sys/build.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,6 @@ fn main() {
8383
cmake_config
8484
.define("MI_USE_CXX", "ON")
8585
.define("MI_WIN_USE_FIXED_TLS", "ON");
86-
if !std::env::var("CARGO_CFG_TARGET_FEATURE")
87-
.map(|s| s.contains("+crt-static"))
88-
.unwrap_or(false)
89-
{
90-
if profile == "debug" {
91-
println!("cargo:rustc-link-lib=ucrtd");
92-
} else {
93-
println!("cargo:rustc-link-lib=ucrt");
94-
}
95-
}
9686
}
9787

9888
let dst = cmake_config.build();

0 commit comments

Comments
 (0)