From 8e7606f204d8775b051cdd9a427ec6dd89b837b8 Mon Sep 17 00:00:00 2001
From: "NODA, Kai" <nodakai@gmail.com>
Date: Mon, 15 Jun 2020 02:11:35 +0800
Subject: [PATCH] bootstrap/install.rs: support a nonexistent `prefix` in `x.py
install`
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().
---
src/bootstrap/install.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index fafd3cdf927c0..fbdef9d8272f7 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -70,7 +70,10 @@ fn install_sh(
let libdir_default = PathBuf::from("lib");
let mandir_default = datadir_default.join("man");
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 datadir = builder.config.datadir.as_ref().unwrap_or(&datadir_default);