Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/cargo/util/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -450,10 +450,19 @@ impl Config {
if let Some(dir) = &self.target_dir {
Ok(Some(dir.clone()))
} else if let Some(dir) = env::var_os("CARGO_TARGET_DIR") {
if dir.to_string_lossy() == "" {
anyhow::bail!("the target directory is set to an empty string")
}

Ok(Some(Filesystem::new(self.cwd.join(dir))))
} else if let Some(val) = &self.build_config()?.target_dir {
let val = val.resolve_path(self);
Ok(Some(Filesystem::new(val)))
let path = val.resolve_path(self);

if val.raw_value() == "" {
anyhow::bail!("the target directory is set to an empty string")
}

Ok(Some(Filesystem::new(path)))
} else {
Ok(None)
}
Expand Down
17 changes: 17 additions & 0 deletions tests/testsuite/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1483,3 +1483,20 @@ Caused by:
unknown variant `invalid`, expected one of `debuginfo`, `none`, `symbols`",
);
}

#[cargo_test]
fn cargo_target_empty_cfg() {
write_config(
"\
[build]
target-dir = ''
",
);

let config = new_config();

assert_error(
config.target_dir().unwrap_err(),
"the target directory is set to an empty string",
);
}