diff options
| author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2017-04-28 11:01:15 +0200 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2017-05-16 08:21:26 +0200 |
| commit | b310a259f80210d3ea2b4eac4ab19cd611b6bfba (patch) | |
| tree | e592472945f38a55c4ca4117b85e7607d05247d6 /src | |
| parent | ae33d99bcd1c1f99b4605d2bb1150c590ffa3044 (diff) | |
| download | rust-b310a259f80210d3ea2b4eac4ab19cd611b6bfba.tar.gz rust-b310a259f80210d3ea2b4eac4ab19cd611b6bfba.zip | |
rustbuild: allow configuring bindir
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/config.rs | 10 | ||||
| -rw-r--r-- | src/bootstrap/config.toml.example | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 9c536111811..28ff14ab30f 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -100,6 +100,7 @@ pub struct Config { pub musl_root: Option<PathBuf>, pub prefix: Option<PathBuf>, pub docdir: Option<PathBuf>, + pub bindir: Option<PathBuf>, pub libdir: Option<PathBuf>, pub libdir_relative: Option<PathBuf>, pub mandir: Option<PathBuf>, @@ -165,9 +166,10 @@ struct Build { #[derive(RustcDecodable, Default, Clone)] struct Install { prefix: Option<String>, - mandir: Option<String>, docdir: Option<String>, + bindir: Option<String>, libdir: Option<String>, + mandir: Option<String>, } /// TOML representation of how the LLVM build is configured. @@ -315,9 +317,10 @@ impl Config { if let Some(ref install) = toml.install { config.prefix = install.prefix.clone().map(PathBuf::from); - config.mandir = install.mandir.clone().map(PathBuf::from); config.docdir = install.docdir.clone().map(PathBuf::from); + config.bindir = install.bindir.clone().map(PathBuf::from); config.libdir = install.libdir.clone().map(PathBuf::from); + config.mandir = install.mandir.clone().map(PathBuf::from); } if let Some(ref llvm) = toml.llvm { @@ -526,6 +529,9 @@ impl Config { "CFG_DOCDIR" => { self.docdir = Some(PathBuf::from(value)); } + "CFG_BINDIR" => { + self.bindir = Some(PathBuf::from(value)); + } "CFG_LIBDIR" => { self.libdir = Some(PathBuf::from(value)); } diff --git a/src/bootstrap/config.toml.example b/src/bootstrap/config.toml.example index 25da976a555..57cafbaf280 100644 --- a/src/bootstrap/config.toml.example +++ b/src/bootstrap/config.toml.example @@ -160,15 +160,18 @@ # Instead of installing to /usr/local, install to this path instead. #prefix = "/usr/local" +# Where to install documentation in `prefix` above +#docdir = "share/doc/rust" + +# Where to install binaries in `prefix` above +#bindir = "bin" + # Where to install libraries in `prefix` above #libdir = "lib" # Where to install man pages in `prefix` above #mandir = "share/man" -# Where to install documentation in `prefix` above -#docdir = "share/doc/rust" - # ============================================================================= # Options for compiling Rust code itself # ============================================================================= |