File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -98,7 +98,7 @@ pub struct Library {
98
98
pub frameworks : Vec < String > ,
99
99
pub framework_paths : Vec < PathBuf > ,
100
100
pub include_paths : Vec < PathBuf > ,
101
- pub ld_options : Vec < Vec < String > > ,
101
+ pub ld_args : Vec < Vec < String > > ,
102
102
pub defines : HashMap < String , Option < String > > ,
103
103
pub version : String ,
104
104
_priv : ( ) ,
@@ -558,7 +558,7 @@ impl Library {
558
558
libs : Vec :: new ( ) ,
559
559
link_paths : Vec :: new ( ) ,
560
560
include_paths : Vec :: new ( ) ,
561
- ld_options : Vec :: new ( ) ,
561
+ ld_args : Vec :: new ( ) ,
562
562
frameworks : Vec :: new ( ) ,
563
563
framework_paths : Vec :: new ( ) ,
564
564
defines : HashMap :: new ( ) ,
@@ -698,7 +698,7 @@ impl Library {
698
698
let meta = format ! ( "rustc-link-arg=-Wl,{}" , ld_option. join( "," ) ) ;
699
699
config. print_metadata ( & meta) ;
700
700
701
- self . ld_options
701
+ self . ld_args
702
702
. push ( ld_option. into_iter ( ) . map ( String :: from) . collect ( ) ) ;
703
703
}
704
704
}
Original file line number Diff line number Diff line change @@ -318,6 +318,6 @@ fn rpath() {
318
318
reset ( ) ;
319
319
let lib = find ( "rpath" ) . unwrap ( ) ;
320
320
assert ! ( lib
321
- . ld_options
321
+ . ld_args
322
322
. contains( & vec![ "-rpath" . to_string( ) , "/usr/local/lib" . to_string( ) , ] ) ) ;
323
323
}
You can’t perform that action at this time.
0 commit comments