@@ -308,7 +308,7 @@ pub fn compile_rest(sess: Session,
308
308
309
309
} ;
310
310
311
- if ( sess. opts . output_info & session:: out_link_args ) > 0 {
311
+ if ( sess. opts . debugging_opts & session:: print_link_args ) != 0 {
312
312
io:: println( str:: connect( link:: link_args( sess,
313
313
& outputs. obj_filename, & outputs. out_filename, link_meta) , " " ) ) ;
314
314
}
@@ -651,7 +651,7 @@ pub fn build_session_options(binary: @~str,
651
651
652
652
let addl_lib_search_paths = getopts::opt_strs(matches, ~" L ").map(|s| Path(*s));
653
653
654
- let linker_args = getopts::opt_strs(matches, ~" linker ").flat_map( |a| {
654
+ let linker_args = getopts::opt_strs(matches, ~" link-args ").flat_map( |a| {
655
655
let mut args = ~[];
656
656
for str::each_split_char(*a, ',') |arg| {
657
657
args.push(str::from_slice(arg));
@@ -664,11 +664,6 @@ pub fn build_session_options(binary: @~str,
664
664
let android_cross_path = getopts::opt_maybe_str(
665
665
matches, ~" android-cross-path");
666
666
667
- let mut output_info = 0;
668
- if opt_present(matches, " print-link-args") {
669
- output_info |= session::out_link_args;
670
- }
671
-
672
667
let sopts = @session::options {
673
668
crate_type: crate_type,
674
669
is_static: static,
@@ -691,7 +686,6 @@ pub fn build_session_options(binary: @~str,
691
686
parse_only: parse_only,
692
687
no_trans: no_trans,
693
688
debugging_opts: debugging_opts,
694
- output_info: output_info,
695
689
android_cross_path: android_cross_path
696
690
};
697
691
return sopts;
@@ -766,7 +760,7 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
766
760
optmulti ( "L" , "" , "Add a directory to the library search path" ,
767
761
"PATH" ) ,
768
762
optflag ( "" , "lib" , "Compile a library crate" ) ,
769
- optmulti ( "" , "linker " , "FLAGS is a comma-separated list of flags
763
+ optmulti ( "" , "link-args " , "FLAGS is a comma-separated list of flags
770
764
passed to the linker" , "FLAGS" ) ,
771
765
optflag ( "" , "ls" , "List the symbols defined by a library crate" ) ,
772
766
optflag ( "" , "no-trans" ,
@@ -787,8 +781,6 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
787
781
typed (crates expanded, with type annotations),
788
782
or identified (fully parenthesized,
789
783
AST nodes and blocks with IDs)" , "TYPE" ) ,
790
- optflag ( "" , "print-link-args" , "Prints all the arguments that would be
791
- passed to the linker." ) ,
792
784
optflag ( "S" , "" , "Compile only; do not assemble or link" ) ,
793
785
optflag ( "" , "save-temps" ,
794
786
"Write intermediate files (.bc, .opt.bc, .o)
0 commit comments