spirv_builder feature compile_codegen to disable building rustc_codegen_spirv

.gitignore

@@ -4,3 +4,4 @@ target/
 tests/Cargo.lock
 .github/install-spirv-tools/Cargo.lock
 rustc-ice-*.txt
+.idea

crates/rustc_codegen_spirv-types/Cargo.toml

@@ -8,6 +8,7 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
+spirv = { version = "0.3.0", features = ["serialize", "deserialize"] }
 rspirv = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

crates/rustc_codegen_spirv/build.rs

@@ -11,6 +11,9 @@ use std::process::{Command, ExitCode};
 use std::{env, fs, mem};
 
 /// Current `rust-toolchain.toml` file
+/// WARNING!!! cargo-gpu is now relying on this being a string literal! It will
+/// scan `build.rs` for any line starting with `channel = "..."` to figure out
+/// which toolchain version to use! This also allows backwards compat.
 /// Unfortunately, directly including the actual workspace `rust-toolchain.toml` doesn't work together with
 /// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
 //const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");

crates/spirv-builder/Cargo.toml

@@ -18,13 +18,17 @@ no-default-features = true
 # that optional dependency, from being automatically created by Cargo, see:
 # https://doc.rust-lang.org/cargo/reference/features.html#optional-dependencies
 [features]
-# See `rustc_codegen_spirv/Cargo.toml` for details on these features.
 default = ["use-compiled-tools"]
-use-installed-tools = ["dep:rustc_codegen_spirv", "rustc_codegen_spirv?/use-installed-tools"]
-use-compiled-tools = ["dep:rustc_codegen_spirv", "rustc_codegen_spirv?/use-compiled-tools"]
+# Compile `rustc_codegen_spirv`, allows constructing SpirvBuilder without
+# explicitly passing in a path to a compiled `rustc_codegen_spirv.so` (or dll)
+rustc_codegen_spirv = ["dep:rustc_codegen_spirv"]
+# See `rustc_codegen_spirv/Cargo.toml` for details on these features.
+use-installed-tools = ["rustc_codegen_spirv", "rustc_codegen_spirv?/use-installed-tools"]
+use-compiled-tools = ["rustc_codegen_spirv", "rustc_codegen_spirv?/use-compiled-tools"]
 skip-toolchain-check = ["rustc_codegen_spirv?/skip-toolchain-check"]
 
 watch = ["dep:notify"]
+clap = ["dep:clap"]
 
 [dependencies]
 # See comment in `src/lib.rs` `invoke_rustc` regarding `rustc_codegen_spirv` dep.
@@ -38,5 +42,9 @@ memchr = "2.4"
 raw-string = "0.3.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+thiserror = "2.0.12"
+semver = { version = "1.0.24", features = ["serde"] }
 
 notify = { version = "7.0", optional = true }
+# Pinning clap, as newer versions have raised min rustc version without being marked a breaking change
+clap = { version = "=4.5.37", optional = true, features = ["derive"] }