Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the msvc target crates for gnullvm targets #1961

Closed
wants to merge 1 commit into from
Closed

Use the msvc target crates for gnullvm targets #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,10 @@ jobs:
cargo clippy -p sample_spellchecker &&
cargo clippy -p sample_uiautomation &&
cargo clippy -p sample_xml &&
cargo clippy -p windows_aarch64_gnullvm &&
cargo clippy -p windows_aarch64_msvc &&
cargo clippy -p windows_i686_gnu &&
cargo clippy -p windows_i686_msvc &&
cargo clippy -p windows_x86_64_gnu &&
cargo clippy -p windows_x86_64_gnullvm &&
cargo clippy -p windows_x86_64_msvc &&
cargo clippy -p test_agile &&
cargo clippy -p test_agile_reference &&
Expand Down Expand Up @@ -186,7 +184,6 @@ jobs:
cargo clippy -p test_winrt &&
cargo clippy -p tool_bindings &&
cargo clippy -p tool_gnu &&
cargo clippy -p tool_gnullvm &&
cargo clippy -p tool_ilrs &&
cargo clippy -p tool_lib &&
cargo clippy -p tool_msvc &&
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,10 @@ jobs:
cargo test --target ${{ matrix.target }} -p sample_spellchecker &&
cargo test --target ${{ matrix.target }} -p sample_uiautomation &&
cargo test --target ${{ matrix.target }} -p sample_xml &&
cargo test --target ${{ matrix.target }} -p windows_aarch64_gnullvm &&
cargo test --target ${{ matrix.target }} -p windows_aarch64_msvc &&
cargo test --target ${{ matrix.target }} -p windows_i686_gnu &&
cargo test --target ${{ matrix.target }} -p windows_i686_msvc &&
cargo test --target ${{ matrix.target }} -p windows_x86_64_gnu &&
cargo test --target ${{ matrix.target }} -p windows_x86_64_gnullvm &&
cargo test --target ${{ matrix.target }} -p windows_x86_64_msvc &&
cargo test --target ${{ matrix.target }} -p test_agile &&
cargo test --target ${{ matrix.target }} -p test_agile_reference &&
Expand Down Expand Up @@ -170,7 +168,6 @@ jobs:
cargo test --target ${{ matrix.target }} -p test_winrt &&
cargo test --target ${{ matrix.target }} -p tool_bindings &&
cargo test --target ${{ matrix.target }} -p tool_gnu &&
cargo test --target ${{ matrix.target }} -p tool_gnullvm &&
cargo test --target ${{ matrix.target }} -p tool_ilrs &&
cargo test --target ${{ matrix.target }} -p tool_lib &&
cargo test --target ${{ matrix.target }} -p tool_msvc &&
Expand Down
4 changes: 2 additions & 2 deletions crates/libs/sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0"
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0" }

[target.aarch64-pc-windows-gnullvm.dependencies]
windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.39.0" }
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0" }

[target.i686-pc-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.39.0" }
Expand All @@ -49,7 +49,7 @@ windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.39.0" }
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.39.0" }

[target.x86_64-pc-windows-gnullvm.dependencies]
windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.39.0" }
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.39.0" }

[features]
default = []
Expand Down
4 changes: 2 additions & 2 deletions crates/libs/windows/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0"
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0" }

[target.aarch64-pc-windows-gnullvm.dependencies]
windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.39.0" }
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0" }

[target.i686-pc-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.39.0" }
Expand All @@ -49,7 +49,7 @@ windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.39.0" }
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.39.0" }

[target.x86_64-pc-windows-gnullvm.dependencies]
windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.39.0" }
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.39.0" }

[dependencies]
windows-implement = { path = "../implement", version = "0.39.0", optional = true }
Expand Down
12 changes: 0 additions & 12 deletions crates/targets/aarch64_gnullvm/Cargo.toml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions crates/targets/aarch64_gnullvm/build.rs
View file
Open in desktop

This file was deleted.

Binary file removed crates/targets/aarch64_gnullvm/lib/libwindows.a
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion crates/targets/aarch64_gnullvm/src/lib.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion crates/targets/aarch64_msvc/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fn main() {
let target = std::env::var("TARGET").unwrap();
if target != "aarch64-pc-windows-msvc" && target != "aarch64-uwp-windows-msvc" {
if !["aarch64-pc-windows-msvc", "aarch64-uwp-windows-msvc", "aarch64-pc-windows-gnullvm"].contains(&&*target) {
return;
}

Expand Down
12 changes: 0 additions & 12 deletions crates/targets/x86_64_gnullvm/Cargo.toml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions crates/targets/x86_64_gnullvm/build.rs
View file
Open in desktop

This file was deleted.

Binary file removed crates/targets/x86_64_gnullvm/lib/libwindows.a
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion crates/targets/x86_64_gnullvm/src/lib.rs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion crates/targets/x86_64_msvc/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fn main() {
let target = std::env::var("TARGET").unwrap();
if target != "x86_64-pc-windows-msvc" && target != "x86_64-uwp-windows-msvc" {
if !["x86_64-pc-windows-msvc", "x86_64-uwp-windows-msvc", "x86_64-pc-windows-gnullvm"].contains(&&*target) {
return;
}

Expand Down
8 changes: 0 additions & 8 deletions crates/tools/gnullvm/Cargo.toml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions crates/tools/gnullvm/readme.md
View file
Open in desktop

This file was deleted.

106 changes: 0 additions & 106 deletions crates/tools/gnullvm/src/main.rs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions crates/tools/sys/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0"
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0" }

[target.aarch64-pc-windows-gnullvm.dependencies]
windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.39.0" }
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0" }

[target.i686-pc-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.39.0" }
Expand All @@ -89,7 +89,7 @@ windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.39.0" }
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.39.0" }

[target.x86_64-pc-windows-gnullvm.dependencies]
windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.39.0" }
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.39.0" }

[features]
default = []
Expand Down
4 changes: 2 additions & 2 deletions crates/tools/windows/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0"
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0" }

[target.aarch64-pc-windows-gnullvm.dependencies]
windows_aarch64_gnullvm = { path = "../../targets/aarch64_gnullvm", version = "0.39.0" }
windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.39.0" }

[target.i686-pc-windows-gnu.dependencies]
windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.39.0" }
Expand All @@ -87,7 +87,7 @@ windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.39.0" }
windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.39.0" }

[target.x86_64-pc-windows-gnullvm.dependencies]
windows_x86_64_gnullvm = { path = "../../targets/x86_64_gnullvm", version = "0.39.0" }
windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.39.0" }

[dependencies]
windows-implement = { path = "../implement", version = "0.39.0", optional = true }
Expand Down