File tree Expand file tree Collapse file tree 3 files changed +6
-18
lines changed
Expand file tree Collapse file tree 3 files changed +6
-18
lines changed Original file line number Diff line number Diff line change 1+ [target .'cfg(target_env = "msvc")' ]
2+ rustflags = [" -C" , " target-feature=+crt-static" ]
Original file line number Diff line number Diff 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"
Original file line number Diff line number Diff line change @@ -42,7 +42,8 @@ fn main() {
4242 cmake_config. define ( "MI_TRACK_ETW" , "ON" ) ;
4343 }
4444
45- if profile == "debug" {
45+ // it's complicated to link ucrt in debug mode on windows
46+ if profile == "debug" && target_env != "msvc" {
4647 cmake_config
4748 . define ( "MI_DEBUG_FULL" , "ON" )
4849 . define ( "MI_SHOW_ERRORS" , "ON" ) ;
@@ -82,17 +83,8 @@ fn main() {
8283 if target_env == "msvc" {
8384 cmake_config
8485 . define ( "MI_USE_CXX" , "ON" )
85- . 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- }
86+ . define ( "MI_WIN_USE_FIXED_TLS" , "ON" )
87+ . static_crt ( true ) ;
9688 }
9789
9890 let dst = cmake_config. build ( ) ;
You can’t perform that action at this time.
0 commit comments