Skip to content

Commit 415a45b

Browse files
committed
Refactor spirv-builder to build codegen and sysroot itself
1 parent 45f2312 commit 415a45b

File tree

20 files changed

+599
-189
lines changed

20 files changed

+599
-189
lines changed

Cargo.lock

Lines changed: 222 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/spirv-builder/Cargo.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@ authors = ["Embark <[email protected]>"]
55
edition = "2018"
66
license = "MIT OR Apache-2.0"
77

8-
# See rustc_codegen_spirv/Cargo.toml for details on these features
9-
[features]
10-
default = ["use-compiled-tools"]
11-
use-installed-tools = ["rustc_codegen_spirv/use-installed-tools"]
12-
use-compiled-tools = ["rustc_codegen_spirv/use-compiled-tools"]
13-
148
[dependencies]
159
memchr = "2.3"
1610
raw-string = "0.3.5"
1711
serde = { version = "1.0", features = ["derive"] }
1812
serde_json = "1.0"
19-
# See comment in lib.rs invoke_rustc for why this is here
20-
rustc_codegen_spirv = { path = "../rustc_codegen_spirv", default-features = false }
13+
# TODO: Update before merge.
14+
cargo-sysroot = { git = "https://github.com/XAMPPRocky/cargo-sysroot", branch = "main" }
15+
git2 = "0.13.12"
16+
eyre = "0.6.2"
17+
remove_dir_all = "0.6.1"
2118

2219
[dev-dependencies]
2320
lazy_static = "1.4"
2421
pretty_assertions = "0.6"
22+
rspirv = { git = "https://github.com/gfx-rs/rspirv.git", rev = "f11f8797bd4df2d1d22cf10767b39a5119c57551" }

crates/spirv-builder/build.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// Empty build script to force cargo to generate an empty `OUT_DIR` directory
2+
/// that we can use as a scratchpad directory for tests.
3+
fn main() {}

0 commit comments

Comments
 (0)