Rollup merge of #39258 - jacwah:makefile-note, r=aturon

steveklabnik · web-flow · commit d7c5f0d4cafc · 2017-01-23T16:40:53.000-05:00
build: Mention rustbuild in Makefile.in comments I think this patch will help newcomers like myself with the build system. I didn't understand that the make targets listed in the Makefile.in comments only worked with the old system, until it was pointed out to me in #39256.
diff --git a/Makefile.in b/Makefile.in
@@ -17,6 +17,10 @@
 # most intimate workings of the compiler itself, you've come to the
 # right place. Let's see what's on the menu.
 #
+# Please note that most of these options only work if configure was
+# run with --disable-rustbuild. For documentation on the new build
+# system, see CONTRIBUTING.md.
+#
 # First, start with one of these build targets:
 #
 #   * all - The default. Build a complete, bootstrapped compiler.

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@`
`17`	`17`	`# most intimate workings of the compiler itself, you've come to the`
`18`	`18`	`# right place. Let's see what's on the menu.`
`19`	`19`	`#`
	`20`	`+# Please note that most of these options only work if configure was`
	`21`	`+# run with --disable-rustbuild. For documentation on the new build`
	`22`	`+# system, see CONTRIBUTING.md.`
	`23`	`+#`
`20`	`24`	`# First, start with one of these build targets:`
`21`	`25`	`#`
`22`	`26`	`# * all - The default. Build a complete, bootstrapped compiler.`