Skip to content

Commit

Permalink
Refactor spirv-builder to build codegen and sysroot itself
Browse files Browse the repository at this point in the history
  • Loading branch information
XAMPPRocky committed Nov 13, 2020
1 parent 45f2312 commit 415a45b
Show file tree
Hide file tree
Showing 20 changed files with 599 additions and 189 deletions.
226 changes: 222 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions crates/spirv-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,18 @@ authors = ["Embark <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"

# See rustc_codegen_spirv/Cargo.toml for details on these features
[features]
default = ["use-compiled-tools"]
use-installed-tools = ["rustc_codegen_spirv/use-installed-tools"]
use-compiled-tools = ["rustc_codegen_spirv/use-compiled-tools"]

[dependencies]
memchr = "2.3"
raw-string = "0.3.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
# See comment in lib.rs invoke_rustc for why this is here
rustc_codegen_spirv = { path = "../rustc_codegen_spirv", default-features = false }
# TODO: Update before merge.
cargo-sysroot = { git = "https://github.com/XAMPPRocky/cargo-sysroot", branch = "main" }
git2 = "0.13.12"
eyre = "0.6.2"
remove_dir_all = "0.6.1"

[dev-dependencies]
lazy_static = "1.4"
pretty_assertions = "0.6"
rspirv = { git = "https://github.com/gfx-rs/rspirv.git", rev = "f11f8797bd4df2d1d22cf10767b39a5119c57551" }
3 changes: 3 additions & 0 deletions crates/spirv-builder/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/// Empty build script to force cargo to generate an empty `OUT_DIR` directory
/// that we can use as a scratchpad directory for tests.
fn main() {}
Loading

0 comments on commit 415a45b

Please sign in to comment.