Skip to content

Commit 9f68f79

Browse files
committed
auto merge of #12364 : Armavica/rust/mk-tips, r=alexcrichton
The command `make tips` did not work properly because of a flaw in the regexp parsing Makefile.in for documentation (`SHOW_DOCS`). I fixed it and also added a note about `make clean` in the build documentation (`make help`).
2 parents 74f3e04 + 54f710f commit 9f68f79

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

Makefile.in

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@
1919
#
2020
# First, start with one of these build targets:
2121
#
22-
# * all - The default. Builds a complete, bootstrapped compiler.
22+
# * all - The default. Build a complete, bootstrapped compiler.
2323
# `rustc` will be in `${target-triple}/stage2/bin/`. Run it
2424
# directly from the build directory if you like. This also
2525
# comes with docs in `doc/`.
2626
#
2727
# * check - Run the complete test suite
2828
#
29+
# * clean - Clean the build repertory. It is advised to run this
30+
# command if you want to build Rust again, after an update
31+
# of the git repository.
32+
#
2933
# * install - Install Rust. Note that installation is not necessary
3034
# to use the compiler.
3135
#
@@ -103,7 +107,7 @@
103107
#
104108
# </tips>
105109
#
106-
# <nittygritty>
110+
# <nitty-gritty>
107111
#
108112
# # The Rust Build System
109113
#
@@ -152,12 +156,12 @@
152156
# libraries are managed and versioned without polluting the common
153157
# areas of the filesystem.
154158
#
155-
# General rust binaries may stil live in the host bin directory; they
159+
# General rust binaries may still live in the host bin directory; they
156160
# will just link against the libraries in the target lib directory.
157161
#
158162
# Admittedly this is a little convoluted.
159163
#
160-
# </nittygritty>
164+
# </nitty-gritty>
161165
#
162166

163167
######################################################################

mk/main.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,13 +446,13 @@ all: $(ALL_TARGET_RULES) $(GENERATED) docs
446446
# $(1) is the name of the doc <section> in Makefile.in
447447
# pick everything between tags | remove first line | remove last line
448448
# | remove extra (?) line | strip leading `#` from lines
449-
SHOW_DOCS = $(Q)awk '/$(1)/,/<\/$(1)>/' $(S)/Makefile.in | sed '1d' | sed '$$d' | sed 's/^\# \?//'
449+
SHOW_DOCS = $(Q)awk '/<$(1)>/,/<\/$(1)>/' $(S)/Makefile.in | sed '1d' | sed '$$d' | sed 's/^\# \?//'
450450

451451
help:
452452
$(call SHOW_DOCS,help)
453453

454-
hot-tips:
455-
$(call SHOW_DOCS,hottips)
454+
tips:
455+
$(call SHOW_DOCS,tips)
456456

457457
nitty-gritty:
458-
$(call SHOW_DOCS,nittygritty)
458+
$(call SHOW_DOCS,nitty-gritty)

0 commit comments

Comments
 (0)