Skip to content

Commit a9dddba

Browse files
catamorphismcatamorphism
committed
rust / build: Remove the rust tool
Sadly, there's a lack of resources for maintaining the `rust` tool, and we decided in the 2013-10-08 Rust team meeting that it's better to remove it altogether than to leave it in a broken state. This deletion is without prejudice. If a person or people appear who would like to maintain the tool, we will probably be happy to resurrect it! Closes #9775
1 parent 62812f1 commit a9dddba

File tree

8 files changed

+1
-442
lines changed

8 files changed

+1
-442
lines changed

‎Makefile.in

-6
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
222222
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
223223
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
224224
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
225-
CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
226225

227226
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
228227
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
@@ -231,15 +230,13 @@ LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
231230
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
232231
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
233232
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
234-
LIBRUST_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rust)
235233
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
236234
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
237235
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
238236
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
239237
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
240238
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
241239
LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
242-
LIBRUST_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rust)
243240

244241
endef
245242

@@ -447,19 +444,16 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
447444
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
448445
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
449446
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
450-
$$(HBIN$(1)_H_$(3))/rust$$(X_$(3)) \
451447
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
452448
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
453449
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
454-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUST_$(3)) \
455450
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
456451
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
457452
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
458453
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
459454
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
460455
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
461456
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \
462-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUST_$(2))
463457

464458
ifeq ($(1),0)
465459
# Don't run the the stage0 compiler under valgrind - that ship has sailed

‎man/rust.1

-111
This file was deleted.

‎mk/clean.mk

-4
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,13 @@ clean$(1)_H_$(2):
7777
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC_$(2))
7878
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX_$(2))
7979
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTI_$(2))
80-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUST_$(2))
8180
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB_$(2))
8281
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_GLOB_$(2))
8382
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
8483
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
8584
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
8685
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB_$(2))
8786
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB_$(2))
88-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUST_GLOB_$(2))
8987
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM_$(2))
9088
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
9189

@@ -112,15 +110,13 @@ clean$(1)_T_$(2)_H_$(3):
112110
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
113111
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
114112
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2))
115-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUST_$(2))
116113
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
117114
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_GLOB_$(2))
118115
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
119116
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
120117
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
121118
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
122119
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTI_GLOB_$(2))
123-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUST_GLOB_$(2))
124120
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))
125121
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
126122
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a

‎mk/dist.mk

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ PKG_FILES := \
3030
driver \
3131
librustpkg \
3232
librusti \
33-
librust \
3433
librustc \
3534
compiletest \
3635
etc \

‎mk/install.mk

-7
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
105105
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTPKG_GLOB_$(1)))
106106
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTDOC_GLOB_$(1)))
107107
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTI_GLOB_$(1)))
108-
$$(Q)$$(call INSTALL_LIB,$$(LIBRUST_GLOB_$(1)))
109108
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
110109

111110
endef
@@ -140,18 +139,15 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
140139
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD_TRIPLE)))
141140
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
142141
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X_$(CFG_BUILD_TRIPLE)))
143-
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X_$(CFG_BUILD_TRIPLE)))
144142
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
145143
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE)))
146144
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
147145
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE)))
148146
$(Q)$(call INSTALL_LIB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE)))
149-
$(Q)$(call INSTALL_LIB,$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE)))
150147
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE)))
151148
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE)))
152149
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE)))
153150
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE)))
154-
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rust.1)
155151
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustc.1)
156152
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustdoc.1)
157153
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rusti.1)
@@ -167,7 +163,6 @@ uninstall:
167163
$(Q)rm -f $(PHB)/rustc$(X_$(CFG_BUILD_TRIPLE))
168164
$(Q)rm -f $(PHB)/rustpkg$(X_$(CFG_BUILD_TRIPLE))
169165
$(Q)rm -f $(PHB)/rusti$(X_$(CFG_BUILD_TRIPLE))
170-
$(Q)rm -f $(PHB)/rust$(X_$(CFG_BUILD_TRIPLE))
171166
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD_TRIPLE))
172167
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
173168
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
@@ -179,12 +174,10 @@ uninstall:
179174
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
180175
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE))) \
181176
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE))) \
182-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE))) \
183177
; \
184178
do rm -f $$i ; \
185179
done
186180
$(Q)rm -Rf $(PHL)/rustc
187-
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rust.1
188181
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustc.1
189182
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustdoc.1
190183
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rusti.1

‎mk/tests.mk

+1-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# The names of crates that must be tested
1717
TEST_TARGET_CRATES = std extra
18-
TEST_HOST_CRATES = rust rusti rustpkg rustc rustdoc syntax
18+
TEST_HOST_CRATES = rusti rustpkg rustc rustdoc syntax
1919
TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
2020

2121
# Markdown files under doc/ that should have their code extracted and run
@@ -387,16 +387,6 @@ $(3)/stage$(1)/test/rustitest-$(2)$$(X_$(2)): \
387387
@$$(call E, compile_and_link: $$@)
388388
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
389389

390-
$(3)/stage$(1)/test/rusttest-$(2)$$(X_$(2)): \
391-
$$(RUST_LIB) $$(RUST_INPUTS) \
392-
$$(SREQ$(1)_T_$(2)_H_$(3)) \
393-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTPKG_$(2)) \
394-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC_$(2)) \
395-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI_$(2)) \
396-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
397-
@$$(call E, compile_and_link: $$@)
398-
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
399-
400390
$(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
401391
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
402392
$$(SREQ$(1)_T_$(2)_H_$(3)) \

‎mk/tools.mk

-46
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ RUSTDOC_INPUTS := $(wildcard $(addprefix $(S)src/librustdoc/, \
2828
RUSTI_LIB := $(S)src/librusti/rusti.rs
2929
RUSTI_INPUTS := $(wildcard $(S)src/librusti/*.rs)
3030

31-
# Rust, the convenience tool
32-
RUST_LIB := $(S)src/librust/rust.rs
33-
RUST_INPUTS := $(wildcard $(S)src/librust/*.rs)
34-
3531
# FIXME: These are only built for the host arch. Eventually we'll
3632
# have tools that need to built for other targets.
3733
define TOOLS_STAGE_N_TARGET
@@ -97,27 +93,6 @@ $$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X_$(4)): \
9793
@$$(call E, compile_and_link: $$@)
9894
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rusti -o $$@ $$<
9995

100-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)): \
101-
$$(RUST_LIB) $$(RUST_INPUTS) \
102-
$$(SREQ$(1)_T_$(4)_H_$(3)) \
103-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
104-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)) \
105-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)) \
106-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
107-
| $$(TLIB$(1)_T_$(4)_H_$(3))/
108-
@$$(call E, compile_and_link: $$@)
109-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUST_GLOB_$(4)),$$(notdir $$@))
110-
$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
111-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUST_GLOB_$(4)),$$(notdir $$@))
112-
113-
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X_$(4)): \
114-
$$(DRIVER_CRATE) \
115-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
116-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)) \
117-
| $$(TBIN$(1)_T_$(4)_H_$(3))/
118-
@$$(call E, compile_and_link: $$@)
119-
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rust -o $$@ $$<
120-
12196
endef
12297

12398
define TOOLS_STAGE_N_HOST
@@ -193,27 +168,6 @@ $$(HBIN$(2)_H_$(4))/rusti$$(X_$(4)): \
193168
@$$(call E, cp: $$@)
194169
$$(Q)cp $$< $$@
195170

196-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUST_$(4)): \
197-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)) \
198-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
199-
$$(HSREQ$(2)_H_$(4)) \
200-
| $$(HLIB$(2)_H_$(4))/
201-
@$$(call E, cp: $$@)
202-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUST_GLOB_$(4)),$$(notdir $$@))
203-
$$(Q)cp $$< $$@
204-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUST_GLOB_$(4)),$$(notdir $$@))
205-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUST_GLOB_$(4)) \
206-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUST_DSYM_GLOB)_$(4)) \
207-
$$(HLIB$(2)_H_$(4))
208-
209-
$$(HBIN$(2)_H_$(4))/rust$$(X_$(4)): \
210-
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X_$(4)) \
211-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUST_$(4)) \
212-
$$(HSREQ$(2)_H_$(4)) \
213-
| $$(HBIN$(2)_H_$(4))/
214-
@$$(call E, cp: $$@)
215-
$$(Q)cp $$< $$@
216-
217171
endef
218172

219173
$(foreach host,$(CFG_HOST_TRIPLES), \

0 commit comments

Comments
 (0)