File tree Expand file tree Collapse file tree 3 files changed +3
-5
lines changed
Expand file tree Collapse file tree 3 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -357,8 +357,8 @@ impl<'a> Builder<'a> {
357357
358358 fn run ( self , builder : & Builder ) -> Interned < PathBuf > {
359359 let compiler = self . compiler ;
360- let lib = if compiler. stage >= 1 && builder. build . config . libdir_relative . is_some ( ) {
361- builder. build . config . libdir_relative . clone ( ) . unwrap ( )
360+ let lib = if compiler. stage >= 1 && builder. build . config . libdir . is_some ( ) {
361+ builder. build . config . libdir . clone ( ) . unwrap ( )
362362 } else {
363363 PathBuf :: from ( "lib" )
364364 } ;
Original file line number Diff line number Diff line change @@ -514,7 +514,7 @@ pub fn rustc_cargo(build: &Build,
514514 . env ( "CFG_PREFIX" , build. config . prefix . clone ( ) . unwrap_or_default ( ) ) ;
515515
516516 let libdir_relative =
517- build. config . libdir_relative . clone ( ) . unwrap_or ( PathBuf :: from ( "lib" ) ) ;
517+ build. config . libdir . clone ( ) . unwrap_or ( PathBuf :: from ( "lib" ) ) ;
518518 cargo. env ( "CFG_LIBDIR_RELATIVE" , libdir_relative) ;
519519
520520 // If we're not building a compiler with debugging information then remove
Original file line number Diff line number Diff line change @@ -121,7 +121,6 @@ pub struct Config {
121121 pub docdir : Option < PathBuf > ,
122122 pub bindir : Option < PathBuf > ,
123123 pub libdir : Option < PathBuf > ,
124- pub libdir_relative : Option < PathBuf > ,
125124 pub mandir : Option < PathBuf > ,
126125 pub codegen_tests : bool ,
127126 pub nodejs : Option < PathBuf > ,
@@ -403,7 +402,6 @@ impl Config {
403402 config. docdir = install. docdir . clone ( ) . map ( PathBuf :: from) ;
404403 config. bindir = install. bindir . clone ( ) . map ( PathBuf :: from) ;
405404 config. libdir = install. libdir . clone ( ) . map ( PathBuf :: from) ;
406- config. libdir_relative = install. libdir . clone ( ) . map ( PathBuf :: from) ;
407405 config. mandir = install. mandir . clone ( ) . map ( PathBuf :: from) ;
408406 }
409407
You can’t perform that action at this time.
0 commit comments