File tree 3 files changed +3
-5
lines changed
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> {
357
357
358
358
fn run ( self , builder : & Builder ) -> Interned < PathBuf > {
359
359
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 ( )
362
362
} else {
363
363
PathBuf :: from ( "lib" )
364
364
} ;
Original file line number Diff line number Diff line change @@ -514,7 +514,7 @@ pub fn rustc_cargo(build: &Build,
514
514
. env ( "CFG_PREFIX" , build. config . prefix . clone ( ) . unwrap_or_default ( ) ) ;
515
515
516
516
let libdir_relative =
517
- build. config . libdir_relative . clone ( ) . unwrap_or ( PathBuf :: from ( "lib" ) ) ;
517
+ build. config . libdir . clone ( ) . unwrap_or ( PathBuf :: from ( "lib" ) ) ;
518
518
cargo. env ( "CFG_LIBDIR_RELATIVE" , libdir_relative) ;
519
519
520
520
// 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 {
121
121
pub docdir : Option < PathBuf > ,
122
122
pub bindir : Option < PathBuf > ,
123
123
pub libdir : Option < PathBuf > ,
124
- pub libdir_relative : Option < PathBuf > ,
125
124
pub mandir : Option < PathBuf > ,
126
125
pub codegen_tests : bool ,
127
126
pub nodejs : Option < PathBuf > ,
@@ -403,7 +402,6 @@ impl Config {
403
402
config. docdir = install. docdir . clone ( ) . map ( PathBuf :: from) ;
404
403
config. bindir = install. bindir . clone ( ) . map ( PathBuf :: from) ;
405
404
config. libdir = install. libdir . clone ( ) . map ( PathBuf :: from) ;
406
- config. libdir_relative = install. libdir . clone ( ) . map ( PathBuf :: from) ;
407
405
config. mandir = install. mandir . clone ( ) . map ( PathBuf :: from) ;
408
406
}
409
407
You can’t perform that action at this time.
0 commit comments