target_specs: replace include_str! with absolute path constant

Author: Firestar99

Cargo.lock

@@ -5,9 +5,9 @@ pub use rspirv::spirv::Capability;
 mod compile_result;
 pub use compile_result::*;
 
-pub mod target_specs;
-pub use target_specs::TARGET_SPECS;
-
 // HACK(eddyb) allows downstream crates to access the correct version directly.
 pub use serde;
 pub use serde_json;
+
+/// directory with all the `target-specs` jsons for our codegen backend
+pub const TARGET_SPEC_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/target-specs");

crates/rustc_codegen_spirv-types/src/lib.rs

@@ -89,7 +89,7 @@ use std::process::{Command, Stdio};
 use thiserror::Error;
 
 pub use rustc_codegen_spirv_types::Capability;
-pub use rustc_codegen_spirv_types::TARGET_SPECS;
+pub use rustc_codegen_spirv_types::TARGET_SPEC_DIR;
 pub use rustc_codegen_spirv_types::{CompileResult, ModuleResult};
 
 #[derive(Debug, Error)]
@@ -974,13 +974,12 @@ fn invoke_rustc(builder: &SpirvBuilder) -> Result<PathBuf, SpirvBuilderError> {
     // target_spec jsons, some later version requires them, some earlier
     // version fails with them (notably our 0.9.0 release)
     if toolchain_rustc_version >= Version::new(1, 76, 0) {
-        cargo
-            .arg("--target")
-            .arg(builder.path_to_target_spec.clone().unwrap_or_else(|| {
-                PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-                    .join("target-specs")
-                    .join(format!("{}.json", target))
-            }));
+        cargo.arg("--target").arg(
+            builder
+                .path_to_target_spec
+                .clone()
+                .unwrap_or_else(|| PathBuf::from(format!("{}/{}.json", TARGET_SPEC_DIR, target))),
+        );
     } else {
         cargo.arg("--target").arg(target);
     }

crates/rustc_codegen_spirv-types/src/target_specs.rs

@@ -16,5 +16,6 @@ use-compiled-tools = ["rustc_codegen_spirv/use-compiled-tools"]
 [dependencies]
 compiletest = { version = "0.9.0", package = "compiletest_rs" }
 rustc_codegen_spirv.workspace = true
+rustc_codegen_spirv-types.workspace = true
 clap = { version = "4", features = ["derive"] }
 itertools = "0.10.5"

crates/spirv-builder/src/lib.rs

@@ -1,5 +1,6 @@
 use clap::Parser;
 use itertools::Itertools as _;
+use rustc_codegen_spirv_types::TARGET_SPEC_DIR;
 use std::{
     env, io,
     path::{Path, PathBuf},
@@ -30,10 +31,7 @@ impl Opt {
 const SPIRV_TARGET_PREFIX: &str = "spirv-unknown-";
 
 fn target_spec_json(target: &str) -> String {
-    format!(
-        "{}/../crates/rustc_codegen_spirv-types/target-specs/{target}.json",
-        env!("CARGO_MANIFEST_DIR")
-    )
+    format!("{TARGET_SPEC_DIR}/{target}.json")
 }
 
 #[derive(Copy, Clone)]