Skip to content

Commit a65733d

Browse files
committed
Fix Windows Builds on stable
1 parent 1756b45 commit a65733d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
steps:
1818
- uses: actions/checkout@v3
19-
- uses: dtolnay/rust-toolchain@1.45.0
20-
if: contains(matrix.os, 'windows')
19+
- uses: dtolnay/rust-toolchain@stable
2120
- name: Run tests
2221
if: contains(matrix.os, 'windows')
2322
run: cargo test --verbose --features "egl build_dlls"
24-
- uses: dtolnay/rust-toolchain@stable
25-
if: ${{ !contains(matrix.os, 'windows') }}
2623
- name: Run test (POSIX)
2724
if: ${{ !contains(matrix.os, 'windows') }}
2825
run: |

build.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ fn build_egl(target: &str) {
124124
assert!(status.unwrap().success());
125125
}
126126

127+
build.link_lib_modifier("-whole-archive");
128+
127129
// Build lib.
128130
build.compile("EGL");
129131
}
@@ -187,6 +189,8 @@ fn build_angle() {
187189
.flag_if_supported("-arch:SSE2"); // MSVC
188190
}
189191

192+
build.link_lib_modifier("-whole-archive");
193+
190194
build.compile("angle");
191195

192196
if egl {

0 commit comments

Comments
 (0)