Implement available paths list.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index b1ea441795e..1a3a008ed26 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -23,6 +23,7 @@ use getopts::Options;
 use Build;
 use config::Config;
 use metadata;
+use builder::Builder;
 
 use cache::{Interned, INTERNER};
 
@@ -248,11 +249,8 @@ Arguments:
             let mut build = Build::new(flags, config);
             metadata::build(&mut build);
 
-            // FIXME: How should this happen now? Not super clear...
-            // let maybe_rules_help = step::build_rules(&build).get_help(subcommand);
-            // if maybe_rules_help.is_some() {
-            //     extra_help.push_str(maybe_rules_help.unwrap().as_str());
-            // }
+            let maybe_rules_help = Builder::get_help(&build, subcommand.as_str());
+            extra_help.push_str(maybe_rules_help.unwrap_or_default().as_str());
         } else {
             extra_help.push_str(format!("Run `./x.py {} -h -v` to see a list of available paths.",
                      subcommand).as_str());