squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

bootstrap/install.rs: support a nonexistent prefix in x.py install

Browse source 
PR #49778 introduced fs::canonicalize() which fails for a nonexistent path.
This is a surprise for someone used to GNU Autotools' configure which can create any necessary intermediate directories in prefix.

This change makes it run fs::create_dir_all() before canonicalize().
This commit is contained in:
NODA, Kai 2020-06-15 02:11:35 +08:00
parent ff4a2533a0
commit 8e7606f204
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/install.rs
View file

@ -70,7 +70,10 @@ fn install_sh(
let libdir_default = PathBuf::from("lib"); let libdir_default = PathBuf::from("lib");
let mandir_default = datadir_default.join("man"); let mandir_default = datadir_default.join("man");
let prefix = builder.config.prefix.as_ref().map_or(prefix_default, |p| { let prefix = builder.config.prefix.as_ref().map_or(prefix_default, |p| {
fs::canonicalize(p).unwrap_or_else(|_| panic!("could not canonicalize {}", p.display())) fs::create_dir_all(p)
.unwrap_or_else(|err| panic!("could not create {}: {}", p.display(), err));
fs::canonicalize(p)
.unwrap_or_else(|err| panic!("could not canonicalize {}: {}", p.display(), err))
}); });
let sysconfdir = builder.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default); let sysconfdir = builder.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default);
let datadir = builder.config.datadir.as_ref().unwrap_or(&datadir_default); let datadir = builder.config.datadir.as_ref().unwrap_or(&datadir_default);