Skip to content

Commit a3202ba

Browse files
nrcnrc
committed
---
yaml --- r: 167671 b: refs/heads/master c: cd31e6f h: refs/heads/master i: 167669: 848732a 167667: cceeaf7 167663: 77cc9b6 v: v3
1 parent 3d20c08 commit a3202ba

File tree

481 files changed

+6561
-10723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

481 files changed

+6561
-10723
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: a239d71729973d56221dd5a51eb987972ecc44d2
2+
refs/heads/master: cd31e6ff3987a1e0f94c64f31d6068c459126667
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c89417130f042c58adc60012e7cddc4ef70b70b9
55
refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

‎trunk/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
# This is hardly all there is to know of The Rust Build System's
100100
# mysteries. The tale continues on the wiki[1][2].
101101
#
102-
# [1]: https://github.com/rust-lang/rust/wiki/Note-getting-started-developing-Rust
102+
# [1]: https://github.com/rust-lang/rust/wiki/Note-build-system
103103
# [2]: https://github.com/rust-lang/rust/wiki/Note-testsuite
104104
#
105105
# If you really feel like getting your hands dirty, then:

‎trunk/mk/clean.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ clean-generic-$(2)-$(1):
6464
-name '*.dll' -o \
6565
-name '*.def' -o \
6666
-name '*.py' -o \
67-
-name '*.pyc' -o \
6867
-name '*.bc' \
6968
\) \
7069
| xargs rm -f
@@ -80,7 +79,7 @@ define CLEAN_HOST_STAGE_N
8079

8180
clean$(1)_H_$(2): \
8281
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
83-
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS_ALL),clean$(1)_H_$(2)-tool-$$(tool))
82+
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS),clean$(1)_H_$(2)-tool-$$(tool))
8483
$$(Q)rm -fr $(2)/rt/libbacktrace
8584

8685
clean$(1)_H_$(2)-tool-%:
@@ -100,7 +99,7 @@ define CLEAN_TARGET_STAGE_N
10099

101100
clean$(1)_T_$(2)_H_$(3): \
102101
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
103-
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS_ALL),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
102+
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
104103
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
105104
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a
106105
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/librun_pass_stage* # For unix

‎trunk/mk/debuggers.mk

Lines changed: 13 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -12,77 +12,26 @@
1212
# Copy debugger related scripts
1313
######################################################################
1414

15+
DEBUGGER_RUSTLIB_ETC_SCRIPTS=lldb_rust_formatters.py
16+
DEBUGGER_BIN_SCRIPTS=rust-lldb
1517

16-
## GDB ##
17-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB=gdb_load_rust_pretty_printers.py \
18-
gdb_rust_pretty_printing.py
19-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS=\
20-
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB), \
21-
$(CFG_SRC_DIR)src/etc/$(script))
22-
23-
DEBUGGER_BIN_SCRIPTS_GDB=rust-gdb
24-
DEBUGGER_BIN_SCRIPTS_GDB_ABS=\
25-
$(foreach script,$(DEBUGGER_BIN_SCRIPTS_GDB), \
26-
$(CFG_SRC_DIR)src/etc/$(script))
27-
28-
29-
## LLDB ##
30-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB=lldb_rust_formatters.py
31-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS=\
32-
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB), \
33-
$(CFG_SRC_DIR)src/etc/$(script))
34-
35-
DEBUGGER_BIN_SCRIPTS_LLDB=rust-lldb
36-
DEBUGGER_BIN_SCRIPTS_LLDB_ABS=\
37-
$(foreach script,$(DEBUGGER_BIN_SCRIPTS_LLDB), \
38-
$(CFG_SRC_DIR)src/etc/$(script))
39-
40-
41-
## ALL ##
42-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB) \
43-
$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB)
44-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
45-
$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS)
46-
DEBUGGER_BIN_SCRIPTS_ALL=$(DEBUGGER_BIN_SCRIPTS_GDB) \
47-
$(DEBUGGER_BIN_SCRIPTS_LLDB)
48-
DEBUGGER_BIN_SCRIPTS_ALL_ABS=$(DEBUGGER_BIN_SCRIPTS_GDB_ABS) \
49-
$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
18+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS=$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS), \
19+
$(CFG_SRC_DIR)src/etc/$(script))
20+
DEBUGGER_BIN_SCRIPTS_ABS=$(foreach script,$(DEBUGGER_BIN_SCRIPTS), \
21+
$(CFG_SRC_DIR)src/etc/$(script))
5022

23+
DEBUGGER_SCRIPTS_ALL=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS) $(DEBUGGER_BIN_SCRIPTS_ABS)
5124

5225
# $(1) - the stage to copy to
5326
# $(2) - the host triple
5427
define DEF_INSTALL_DEBUGGER_SCRIPTS_HOST
5528

56-
tmp/install-debugger-scripts$(1)_H_$(2)-gdb.done: \
57-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
58-
$$(DEBUGGER_BIN_SCRIPTS_GDB_ABS)
59-
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
60-
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
61-
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $$(HBIN$(1)_H_$(2))
62-
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
63-
$(Q)touch $$@
64-
65-
tmp/install-debugger-scripts$(1)_H_$(2)-lldb.done: \
66-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) \
67-
$$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
68-
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
69-
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
70-
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $$(HBIN$(1)_H_$(2))
71-
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
72-
$(Q)touch $$@
73-
74-
tmp/install-debugger-scripts$(1)_H_$(2)-all.done: \
75-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) \
76-
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS)
29+
tmp/install-debugger-scripts$(1)_H_$(2).done: $$(DEBUGGER_SCRIPTS_ALL)
7730
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
7831
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
79-
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_ALL_ABS) $$(HBIN$(1)_H_$(2))
80-
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
32+
$(Q)install $(DEBUGGER_BIN_SCRIPTS_ABS) $$(HBIN$(1)_H_$(2))
33+
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
8134
$(Q)touch $$@
82-
83-
tmp/install-debugger-scripts$(1)_H_$(2)-none.done:
84-
$(Q)touch $$@
85-
8635
endef
8736

8837
# Expand host make-targets for all stages
@@ -95,36 +44,12 @@ $(foreach stage,$(STAGES), \
9544
# $(3) is the host triple
9645
define DEF_INSTALL_DEBUGGER_SCRIPTS_TARGET
9746

98-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-gdb.done: \
99-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
100-
$$(DEBUGGER_BIN_SCRIPTS_GDB_ABS)
101-
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
102-
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
103-
$(Q)install $(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
104-
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
105-
$(Q)touch $$@
106-
107-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-lldb.done: \
108-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) \
109-
$$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
47+
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3).done: $$(DEBUGGER_SCRIPTS_ALL)
11048
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
11149
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
112-
$(Q)install $(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
113-
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
50+
$(Q)install $(DEBUGGER_BIN_SCRIPTS_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
51+
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
11452
$(Q)touch $$@
115-
116-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-all.done: \
117-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) \
118-
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS)
119-
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
120-
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
121-
$(Q)install $(DEBUGGER_BIN_SCRIPTS_ALL_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
122-
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
123-
$(Q)touch $$@
124-
125-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-none.done:
126-
$(Q)touch $$@
127-
12853
endef
12954

13055
# Expand target make-targets for all stages

‎trunk/mk/dist.mk

Lines changed: 22 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
# * dist-docs - Stage docs for upload
2424

2525
PKG_NAME := $(CFG_PACKAGE_NAME)
26-
DOC_PKG_NAME := rust-docs-$(CFG_PACKAGE_VERS)
27-
MINGW_PKG_NAME := rust-mingw-$(CFG_PACKAGE_VERS)
2826

2927
# License suitable for displaying in a popup
3028
LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
@@ -231,20 +229,10 @@ dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
231229
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)
232230
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)
233231
$$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)
234-
$$(Q)mkdir -p $$(PREPARE_DEST_DIR)/share/doc/rust
235-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)COPYRIGHT $$(PREPARE_DEST_DIR)/share/doc/rust
236-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)/share/doc/rust
237-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)/share/doc/rust
238-
$$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)/share/doc/rust
232+
$$(Q)[ ! -d doc ] || cp -r doc $$(PREPARE_DEST_DIR)
239233

240234
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
241235
@$(call E, build: $$@)
242-
# Copy essential gcc components into installer
243-
ifdef CFG_WINDOWSY_$(1)
244-
$$(Q)rm -Rf dist/win-rust-gcc-$(1)
245-
$$(Q)$$(CFG_PYTHON) $$(S)src/etc/make-win-dist.py tmp/dist/$$(PKG_NAME)-$(1)-image dist/win-rust-gcc-$(1) $(1)
246-
$$(Q)cp -r $$(S)src/etc/third-party tmp/dist/$$(PKG_NAME)-$(1)-image/share/doc/
247-
endif
248236
$$(Q)$$(S)src/rust-installer/gen-installer.sh \
249237
--product-name=Rust \
250238
--verify-bin=rustc \
@@ -254,50 +242,9 @@ endif
254242
--work-dir=tmp/dist \
255243
--output-dir=dist \
256244
--non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \
257-
--package-name=$$(PKG_NAME)-$(1) \
258-
--component-name=rustc \
259-
--legacy-manifest-dirs=rustlib,cargo
245+
--package-name=$$(PKG_NAME)-$(1)
260246
$$(Q)rm -R tmp/dist/$$(PKG_NAME)-$(1)-image
261247

262-
dist-doc-install-dir-$(1): docs compiler-docs
263-
$$(Q)mkdir -p tmp/dist/$$(DOC_PKG_NAME)-$(1)-image/share/doc/rust
264-
$$(Q)cp -r doc tmp/dist/$$(DOC_PKG_NAME)-$(1)-image/share/doc/rust/html
265-
266-
dist/$$(DOC_PKG_NAME)-$(1).tar.gz: dist-doc-install-dir-$(1)
267-
@$(call E, build: $$@)
268-
$$(Q)$$(S)src/rust-installer/gen-installer.sh \
269-
--product-name=Rust-Documentation \
270-
--rel-manifest-dir=rustlib \
271-
--success-message=Rust-documentation-is-installed. \
272-
--image-dir=tmp/dist/$$(DOC_PKG_NAME)-$(1)-image \
273-
--work-dir=tmp/dist \
274-
--output-dir=dist \
275-
--package-name=$$(DOC_PKG_NAME)-$(1) \
276-
--component-name=rust-docs \
277-
--legacy-manifest-dirs=rustlib,cargo \
278-
--bulk-dirs=share/doc/rust/html
279-
$$(Q)rm -R tmp/dist/$$(DOC_PKG_NAME)-$(1)-image
280-
281-
dist-mingw-install-dir-$(1):
282-
$$(Q)mkdir -p tmp/dist/rust-mingw-tmp-$(1)-image
283-
$$(Q)rm -Rf tmp/dist/$$(MINGW_PKG_NAME)-$(1)-image
284-
$$(Q)$$(CFG_PYTHON) $$(S)src/etc/make-win-dist.py \
285-
tmp/dist/rust-mingw-tmp-$(1)-image tmp/dist/$$(MINGW_PKG_NAME)-$(1)-image $(1)
286-
287-
dist/$$(MINGW_PKG_NAME)-$(1).tar.gz: dist-mingw-install-dir-$(1)
288-
@$(call E, build: $$@)
289-
$$(Q)$$(S)src/rust-installer/gen-installer.sh \
290-
--product-name=Rust-MinGW \
291-
--rel-manifest-dir=rustlib \
292-
--success-message=Rust-MinGW-is-installed. \
293-
--image-dir=tmp/dist/$$(MINGW_PKG_NAME)-$(1)-image \
294-
--work-dir=tmp/dist \
295-
--output-dir=dist \
296-
--package-name=$$(MINGW_PKG_NAME)-$(1) \
297-
--component-name=rust-mingw \
298-
--legacy-manifest-dirs=rustlib,cargo
299-
$$(Q)rm -R tmp/dist/$$(MINGW_PKG_NAME)-$(1)-image
300-
301248
endef
302249

303250
ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
@@ -310,16 +257,7 @@ endif
310257

311258
dist-install-dirs: $(foreach host,$(CFG_HOST),dist-install-dir-$(host))
312259

313-
ifdef CFG_WINDOWSY_$(CFG_BUILD)
314-
MAYBE_MINGW_TARBALLS=$(foreach host,$(CFG_HOST),dist/$(MINGW_PKG_NAME)-$(host).tar.gz)
315-
endif
316-
317-
ifeq ($(CFG_DISABLE_DOCS),)
318-
MAYBE_DOC_TARBALLS=$(foreach host,$(CFG_HOST),dist/$(DOC_PKG_NAME)-$(host).tar.gz)
319-
endif
320-
321-
dist-tar-bins: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).tar.gz) \
322-
$(MAYBE_DOC_TARBALLS) $(MAYBE_MINGW_TARBALLS)
260+
dist-tar-bins: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).tar.gz)
323261

324262
# Just try to run the compiler for the build host
325263
distcheck-tar-bins: dist-tar-bins
@@ -351,20 +289,27 @@ distcheck-docs: dist-docs
351289
# Primary targets (dist, distcheck)
352290
######################################################################
353291

354-
MAYBE_DIST_TAR_SRC=dist-tar-src
355-
MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src
292+
ifdef CFG_WINDOWSY_$(CFG_BUILD)
293+
294+
dist: dist-win dist-tar-bins
295+
296+
distcheck: distcheck-win
297+
$(Q)rm -Rf tmp/distcheck
298+
@echo
299+
@echo -----------------------------------------------
300+
@echo "Rust ready for distribution (see ./dist)"
301+
@echo -----------------------------------------------
302+
303+
else
356304

357305
# FIXME #13224: On OS X don't produce tarballs simply because --exclude-vcs don't work.
358306
# This is a huge hack because I just don't have time to figure out another solution.
359307
ifeq ($(CFG_OSTYPE), apple-darwin)
360308
MAYBE_DIST_TAR_SRC=
361309
MAYBE_DISTCHECK_TAR_SRC=
362-
endif
363-
364-
# Don't bother with source tarballs on windows just because we historically haven't.
365-
ifeq ($(CFG_OSTYPE), pc-windows-gnu)
366-
MAYBE_DIST_TAR_SRC=
367-
MAYBE_DISTCHECK_TAR_SRC=
310+
else
311+
MAYBE_DIST_TAR_SRC=dist-tar-src
312+
MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src
368313
endif
369314

370315
ifneq ($(CFG_DISABLE_DOCS),)
@@ -375,13 +320,15 @@ MAYBE_DIST_DOCS=dist-docs
375320
MAYBE_DISTCHECK_DOCS=distcheck-docs
376321
endif
377322

378-
dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-win dist-tar-bins $(MAYBE_DIST_DOCS)
323+
dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins $(MAYBE_DIST_DOCS)
379324

380-
distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-win distcheck-tar-bins $(MAYBE_DISTCHECK_DOCS)
325+
distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins $(MAYBE_DISTCHECK_DOCS)
381326
$(Q)rm -Rf tmp/distcheck
382327
@echo
383328
@echo -----------------------------------------------
384329
@echo "Rust ready for distribution (see ./dist)"
385330
@echo -----------------------------------------------
386331

332+
endif
333+
387334
.PHONY: dist distcheck

‎trunk/mk/grammar.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $(BG):
3131
$(Q)mkdir -p $(BG)
3232

3333
$(BG)RustLexer.class: $(BG) $(SG)RustLexer.g4
34-
$(Q)$(CFG_ANTLR4) -o $(BG) $(SG)RustLexer.g4
34+
$(Q)$(CFG_ANTLR4) -o $(B)grammar $(SG)RustLexer.g4
3535
$(Q)$(CFG_JAVAC) -d $(BG) $(BG)RustLexer.java
3636

3737
check-build-lexer-verifier: $(BG)verify

‎trunk/mk/install.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
2020
$(Q)sudo -u "$$SUDO_USER" $(MAKE) prepare_install
2121
else
2222
$(Q)$(MAKE) prepare_install
23-
endif
24-
ifeq ($(CFG_DISABLE_DOCS),)
25-
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
2623
endif
2724
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
2825
# Remove tmp files because it's a decent amount of disk space
@@ -36,9 +33,6 @@ ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER)))
3633
$(Q)sudo -u "$$SUDO_USER" $(MAKE) prepare_uninstall
3734
else
3835
$(Q)$(MAKE) prepare_uninstall
39-
endif
40-
ifeq ($(CFG_DISABLE_DOCS),)
41-
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(DOC_PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
4236
endif
4337
$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
4438
# Remove tmp files because it's a decent amount of disk space

0 commit comments

Comments
 (0)