Skip to content

Commit 40d1380

Browse files
committed
don't mess with the output_dir parameter in the toml file
1 parent c34e883 commit 40d1380

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

crates/cargo-gpu/src/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ impl Build {
3838
// Ensure the shader output dir exists
3939
log::debug!("ensuring output-dir '{}' exists", self.output_dir.display());
4040
std::fs::create_dir_all(&self.output_dir)?;
41-
self.output_dir = self.output_dir.canonicalize()?;
41+
let canonicalized = self.output_dir.canonicalize()?;
42+
log::debug!("canonicalized output dir: {canonicalized:?}");
43+
self.output_dir = canonicalized;
4244

4345
// Ensure the shader crate exists
4446
self.install.shader_crate = self.install.shader_crate.canonicalize()?;

crates/cargo-gpu/src/toml.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ impl Toml {
117117
command: Command::Build(mut build),
118118
} = Cli::parse_from(parameters)
119119
{
120-
// Ensure that the output directory is relative to the toml file
121-
if build.output_dir.is_relative() {
122-
let dir = path.parent().context("no path parent")?;
123-
build.output_dir = dir.join(build.output_dir);
124-
}
125-
126120
log::debug!("build: {build:?}");
127121
build.run()?;
128122
} else {

0 commit comments

Comments
 (0)