Skip to content

Commit ea99655

Browse files
z0w0z0w0
committed
rusti: Remove linenoise module, add to rt, remove core::rl
1 parent 1afa299 commit ea99655

21 files changed

+764
-124
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@
44
[submodule "src/libuv"]
55
path = src/libuv
66
url = git://github.com/graydon/libuv.git
7-
[submodule "src/linenoise"]
8-
path = src/linenoise
9-
url = git://github.com/antirez/linenoise.git

‎Makefile.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ endif
7474

7575
CFG_RUSTC_FLAGS := $(RUSTFLAGS)
7676
CFG_GCCISH_CFLAGS :=
77-
CFG_GCCISH_CXXFLAGS :=
7877
CFG_GCCISH_LINK_FLAGS :=
7978

8079
ifdef CFG_DISABLE_OPTIMIZE
@@ -337,8 +336,7 @@ HSREQ$(1)_H_$(3) = \
337336
TSREQ$(1)_T_$(2)_H_$(3) = \
338337
$$(HSREQ$(1)_H_$(3)) \
339338
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUNTIME) \
340-
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a \
341-
$$(TLIB$(1)_T_$(2)_H_$(3))/liblinenoise.a
339+
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
342340

343341
# Prerequisites for complete stageN targets
344342
SREQ$(1)_T_$(2)_H_$(3) = \
@@ -451,8 +449,8 @@ TSREQS := \
451449
$(SREQ3_T_$(target)_H_$(CFG_HOST_TRIPLE)))
452450
FUZZ := $(HBIN2_H_$(CFG_HOST_TRIPLE))/fuzzer$(X)
453451
CARGO := $(HBIN2_H_$(CFG_HOST_TRIPLE))/cargo$(X)
454-
RUSTI := $(HBIN2_H_$(CFG_HOST_TRIPLE))/rusti$(X)
455452
RUSTDOC := $(HBIN2_H_$(CFG_HOST_TRIPLE))/rustdoc$(X)
453+
RUSTI := $(HBIN2_H_$(CFG_HOST_TRIPLE))/rusti$(X)
456454

457455
all: rustc $(GENERATED) docs $(FUZZ) $(CARGO) $(RUSTDOC) $(RUSTI)
458456

@@ -492,7 +490,6 @@ include $(CFG_SRC_DIR)mk/host.mk
492490
include $(CFG_SRC_DIR)mk/stage0.mk
493491
include $(CFG_SRC_DIR)mk/rt.mk
494492
include $(CFG_SRC_DIR)mk/rustllvm.mk
495-
include $(CFG_SRC_DIR)mk/linenoise.mk
496493
include $(CFG_SRC_DIR)mk/tools.mk
497494
include $(CFG_SRC_DIR)mk/docs.mk
498495
include $(CFG_SRC_DIR)mk/llvm.mk

‎configure

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -508,18 +508,12 @@ do
508508
make_dir rustllvm/$t
509509
done
510510

511-
make_dir linenoise
512-
for t in $CFG_TARGET_TRIPLES
513-
do
514-
make_dir linenoise/$t
515-
done
516-
517511
make_dir rt
518512
for t in $CFG_TARGET_TRIPLES
519513
do
520514
make_dir rt/$t
521515
for i in \
522-
isaac bigint sync test arch/i386 arch/x86_64 \
516+
isaac linenoise bigint sync test arch/i386 arch/x86_64 \
523517
libuv libuv/src/ares libuv/src/eio libuv/src/ev
524518
do
525519
make_dir rt/$t/$i

‎mk/clean.mk

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,19 @@ clean: clean-misc $(CLEAN_STAGE_RULES)
2323

2424
clean-misc:
2525
@$(call E, cleaning)
26-
$(Q)find linenoise rustllvm rt $(CFG_HOST_TRIPLE)/test \
26+
$(Q)find rustllvm rt $(CFG_HOST_TRIPLE)/test \
2727
-name '*.[odasS]' -o \
2828
-name '*.so' -o \
2929
-name '*.dylib' -o \
3030
-name '*.dll' -o \
3131
-name '*.def' -o \
3232
-name '*.bc' \
3333
| xargs rm -f
34-
$(Q)find linenoise rustllvm rt $(CFG_HOST_TRIPLE)\
34+
$(Q)find rustllvm rt $(CFG_HOST_TRIPLE)\
3535
-name '*.dSYM' \
3636
| xargs rm -Rf
3737
$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)
3838
$(Q)rm -f $(RUSTLLVM_LIB_OBJS) $(RUSTLLVM_OBJS_OBJS) $(RUSTLLVM_DEF)
39-
$(Q)rm -f $(LINENOISE_OBJS)
4039
$(Q)rm -Rf $(DOCS)
4140
$(Q)rm -Rf $(GENERATED)
4241
$(Q)rm -f tmp/*.log tmp/*.rc tmp/*.rs
@@ -56,7 +55,6 @@ clean$(1)_H_$(2):
5655
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustc$(X)
5756
$(Q)rm -f $$(HBIN$(1)_H_$(2))/fuzzer$(X)
5857
$(Q)rm -f $$(HBIN$(1)_H_$(2))/cargo$(X)
59-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X)
6058
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X)
6159
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X)
6260
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME)
@@ -83,7 +81,6 @@ clean$(1)_T_$(2)_H_$(3):
8381
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$(X)
8482
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/fuzzer$(X)
8583
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/cargo$(X)
86-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rusti$(X)
8784
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X)
8885
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X)
8986
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME)
@@ -98,7 +95,6 @@ clean$(1)_T_$(2)_H_$(3):
9895
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM)
9996
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
10097
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
101-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/liblinenoise.a
10298
endef
10399

104100
$(foreach host, $(CFG_TARGET_TRIPLES), \

‎mk/dist.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ PKG_FILES := \
3030
libcore \
3131
libsyntax \
3232
libstd \
33-
linenoise \
3433
rt \
3534
rustdoc \
3635
rustllvm \

‎mk/linenoise.mk

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎mk/platform.mk

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ endif
103103

104104
# Hack: not sure how to test if a file exists in make other than this
105105
OS_SUPP = $(patsubst %,--suppressions=%,\
106-
$(wildcard $(CFG_SRC_DIR)src/etc/$(CFG_OSTYPE).supp*))
106+
$(wildcard $(CFG_SRC_DIR)src/etc/$(CFG_OSTYPE).supp*))
107107

108108
ifneq ($(findstring mingw,$(CFG_OSTYPE)),)
109109
CFG_WINDOWSY := 1
@@ -231,18 +231,18 @@ ifeq ($(CFG_C_COMPILER),clang)
231231
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
232232
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
233233
$$(call CFG_INSTALL_NAME,$$(4))
234-
CFG_COMPILE_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
235-
$$(CFG_GCCISH_CFLAGS) $$(CFG_CLANG_CFLAGS) \
234+
CFG_COMPILE_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
235+
$$(CFG_GCCISH_CFLAGS) $$(CFG_CLANG_CFLAGS) \
236236
$$(CFG_GCCISH_CXXFLAGS) \
237-
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
238-
$$(CFG_CLANG_CFLAGS_$$(HOST_$(1))) \
237+
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
238+
$$(CFG_CLANG_CFLAGS_$$(HOST_$(1))) \
239239
$$(CFG_DEPEND_FLAGS) \
240-
-c -o $$(1) $$(2)
241-
CFG_LINK_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
242-
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
243-
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
244-
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
245-
$$(call CFG_INSTALL_NAME,$$(4))
240+
-c -o $$(1) $$(2)
241+
CFG_LINK_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
242+
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
243+
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
244+
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
245+
$$(call CFG_INSTALL_NAME,$$(4))
246246
endef
247247

248248
$(foreach target,$(CFG_TARGET_TRIPLES), \
@@ -278,18 +278,18 @@ ifeq ($(CFG_C_COMPILER),gcc)
278278
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
279279
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
280280
$$(call CFG_INSTALL_NAME,$$(4))
281-
CFG_COMPILE_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
282-
$$(CFG_GCCISH_CFLAGS) \
281+
CFG_COMPILE_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
282+
$$(CFG_GCCISH_CFLAGS) \
283283
$$(CFG_GCCISH_CXXFLAGS) \
284-
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
285-
$$(CFG_GCC_CFLAGS) \
286-
$$(CFG_GCC_CFLAGS_$$(HOST_$(1))) \
284+
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
285+
$$(CFG_GCC_CFLAGS) \
286+
$$(CFG_GCC_CFLAGS_$$(HOST_$(1))) \
287287
$$(CFG_DEPEND_FLAGS) \
288288
-c -o $$(1) $$(2)
289-
CFG_LINK_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
290-
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
291-
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
292-
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
289+
CFG_LINK_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
290+
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
291+
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
292+
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
293293
$$(call CFG_INSTALL_NAME,$$(4))
294294
endef
295295

@@ -312,4 +312,4 @@ define CFG_MAKE_ASSEMBLER
312312
endef
313313

314314
$(foreach target,$(CFG_TARGET_TRIPLES),\
315-
$(eval $(call CFG_MAKE_ASSEMBLER,$(target))))
315+
$(eval $(call CFG_MAKE_ASSEMBLER,$(target))))

‎mk/pp.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ else
88
$(wildcard $(S)src/test/*/*.rs \
99
$(S)src/test/*/*/*.rs) \
1010
$(wildcard $(S)src/fuzzer/*.rs) \
11-
$(wildcard $(S)src/cargo/*.rs)
11+
$(wildcard $(S)src/cargo/*.rs) \
1212
$(wildcard $(S)src/rusti/*.rs)
1313

1414
PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L \

‎mk/rt.mk

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ define DEF_RUNTIME_TARGETS
4242
# Runtime (C++) library variables
4343
######################################################################
4444

45-
RUNTIME_CS_$(1) := \
45+
RUNTIME_CXXS_$(1) := \
4646
rt/sync/timer.cpp \
4747
rt/sync/lock_and_signal.cpp \
4848
rt/sync/rust_thread.cpp \
@@ -78,6 +78,8 @@ RUNTIME_CS_$(1) := \
7878
rt/arch/$$(HOST_$(1))/context.cpp \
7979
rt/arch/$$(HOST_$(1))/gpr.cpp
8080

81+
RUNTIME_CS_$(1) := rt/linenoise/linenoise.c
82+
8183
RUNTIME_S_$(1) := rt/arch/$$(HOST_$(1))/_context.S \
8284
rt/arch/$$(HOST_$(1))/ccall.S \
8385
rt/arch/$$(HOST_$(1))/record_sp.S
@@ -104,9 +106,11 @@ endif
104106

105107
RUNTIME_DEF_$(1) := rt/rustrt$$(CFG_DEF_SUFFIX)
106108
RUNTIME_INCS_$(1) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
107-
-I $$(S)src/rt/arch/$$(HOST_$(1)) \
108-
-I $$(S)src/libuv/include
109-
RUNTIME_OBJS_$(1) := $$(RUNTIME_CS_$(1):rt/%.cpp=rt/$(1)/%.o) \
109+
-I $$(S)src/rt/arch/$$(HOST_$(1)) \
110+
-I $$(S)src/rt/linenoise \
111+
-I $$(S)src/libuv/include
112+
RUNTIME_OBJS_$(1) := $$(RUNTIME_CXXS_$(1):rt/%.cpp=rt/$(1)/%.o) \
113+
$$(RUNTIME_CS_$(1):rt/%.c=rt/$(1)/%.o) \
110114
$$(RUNTIME_S_$(1):rt/%.S=rt/$(1)/%.o)
111115
ALL_OBJ_FILES += $$(RUNTIME_OBJS_$(1))
112116

@@ -120,6 +124,11 @@ rt/$(1)/%.o: rt/%.cpp $$(MKFILE_DEPS)
120124
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, $$(RUNTIME_INCS_$(1)) \
121125
$$(SNAP_DEFINES)) $$<
122126

127+
rt/$(1)/%.o: rt/%.c $$(MKFILE_DEPS)
128+
@$$(call E, compile: $$@)
129+
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(RUNTIME_INCS_$(1)) \
130+
$$(SNAP_DEFINES)) $$<
131+
123132
rt/$(1)/%.o: rt/%.S $$(MKFILE_DEPS) \
124133
$$(LLVM_CONFIG_$$(CFG_HOST_TRIPLE))
125134
@$$(call E, compile: $$@)

‎mk/target.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
1919
@$$(call E, cp: $$@)
2020
$$(Q)cp $$< $$@
2121

22-
$$(TLIB$(1)_T_$(2)_H_$(3))/liblinenoise.a: \
23-
linenoise/$(2)/liblinenoise.a
24-
@$$(call E, cp: $$@)
25-
$$(Q)cp $$< $$@
26-
2722
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM): \
2823
rustllvm/$(2)/$$(CFG_RUSTLLVM)
2924
@$$(call E, cp: $$@)

‎mk/tests.mk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ check-stage$(1)-T-$(2)-H-$(3): \
229229
check-stage$(1)-T-$(2)-H-$(3)-bench \
230230
check-stage$(1)-T-$(2)-H-$(3)-pretty \
231231
check-stage$(1)-T-$(2)-H-$(3)-rustdoc \
232-
check-stage$(1)-T-$(2)-H-$(3)-rusti \
232+
check-stage$(1)-T-$(2)-H-$(3)-rusti \
233233
check-stage$(1)-T-$(2)-H-$(3)-cargo \
234234
check-stage$(1)-T-$(2)-H-$(3)-doc-tutorial \
235235
check-stage$(1)-T-$(2)-H-$(3)-doc-tutorial-ffi \
@@ -392,6 +392,7 @@ check-stage$(1)-T-$(2)-H-$(3)-rusti-dummy: \
392392
$$(Q)$$(call CFG_RUN_TEST,$$<,$(2),$(3)) $$(TESTARGS) \
393393
--logfile tmp/check-stage$(1)-T-$(2)-H-$(3)-rusti.log
394394

395+
395396
# Rules for the cargo test runner
396397

397398
$(3)/test/cargotest.stage$(1)-$(2)$$(X): \
@@ -870,9 +871,6 @@ check-stage$(1)-H-all-pretty-pretty: \
870871
check-stage$(1)-H-all-rustdoc: \
871872
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
872873
check-stage$(1)-H-$$(target)-rustdoc)
873-
check-stage$(1)-H-all-rusti: \
874-
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
875-
check-stage$(1)-H-$$(target)-rusti)
876874
check-stage$(1)-H-all-cargo: \
877875
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
878876
check-stage$(1)-H-$$(target)-cargo)
@@ -907,7 +905,6 @@ check-stage$(1)-pretty-rfail: check-stage$(1)-H-$$(CFG_HOST_TRIPLE)-pretty-rfail
907905
check-stage$(1)-pretty-bench: check-stage$(1)-H-$$(CFG_HOST_TRIPLE)-pretty-bench
908906
check-stage$(1)-pretty-pretty: check-stage$(1)-H-$$(CFG_HOST_TRIPLE)-pretty-pretty
909907
check-stage$(1)-rustdoc: check-stage$(1)-H-$$(CFG_HOST_TRIPLE)-rustdoc
910-
check-stage$(1)-rusti: check-stage$(1)-H-$$(CFG_HOST_TRIPLE)-rusti
911908
check-stage$(1)-cargo: check-stage$(1)-H-$$(CFG_HOST_TRIPLE)-cargo
912909
check-stage$(1)-doc-tutorial: check-stage$(1)-H-$$(CFG_HOST_TRIPLE)-doc-tutorial
913910
check-stage$(1)-doc-tutorial-ffi: check-stage$(1)-H-$$(CFG_HOST_TRIPLE)-doc-tutorial-ffi

‎mk/tools.mk

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ COMPILETEST_INPUTS := $(wildcard $(S)src/compiletest/*rs)
1212
CARGO_CRATE := $(S)src/cargo/cargo.rc
1313
CARGO_INPUTS := $(wildcard $(S)src/cargo/*rs)
1414

15-
# Rusti, the JIT REPL
16-
RUSTI_CRATE := $(S)src/rusti/rusti.rc
17-
RUSTI_INPUTS := $(wildcard $(S)src/rusti/*rs)
18-
1915
# Rustdoc, the documentation tool
2016
RUSTDOC_CRATE := $(S)src/rustdoc/rustdoc.rc
2117
RUSTDOC_INPUTS := $(wildcard $(S)src/rustdoc/*.rs)
2218

19+
# Rusti, the JIT REPL
20+
RUSTI_CRATE := $(S)src/rusti/rusti.rc
21+
RUSTI_INPUTS := $(wildcard $(S)src/rusti/*.rs)
22+
2323
# FIXME: These are only built for the host arch. Eventually we'll
2424
# have tools that need to built for other targets.
2525
define TOOLS_STAGE_N
@@ -66,38 +66,38 @@ $$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X): \
6666
@$$(call E, compile_and_link: $$@)
6767
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
6868

69-
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X): \
70-
$$(RUSTI_CRATE) $$(RUSTI_INPUTS) \
69+
$$(HBIN$(2)_H_$(4))/cargo$$(X): \
70+
$$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X) \
71+
$$(HSREQ$(2)_H_$(4))
72+
@$$(call E, cp: $$@)
73+
$$(Q)cp $$< $$@
74+
75+
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X): \
76+
$$(RUSTDOC_CRATE) $$(RUSTDOC_INPUTS) \
7177
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
7278
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
7379
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
7480
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
7581
@$$(call E, compile_and_link: $$@)
7682
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
7783

78-
$$(HBIN$(2)_H_$(4))/cargo$$(X): \
79-
$$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X) \
80-
$$(HSREQ$(2)_H_$(4))
81-
@$$(call E, cp: $$@)
82-
$$(Q)cp $$< $$@
83-
84-
$$(HBIN$(2)_H_$(4))/rusti$$(X): \
85-
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X) \
84+
$$(HBIN$(2)_H_$(4))/rustdoc$$(X): \
85+
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X) \
8686
$$(HSREQ$(2)_H_$(4))
8787
@$$(call E, cp: $$@)
8888
$$(Q)cp $$< $$@
8989

90-
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X): \
91-
$$(RUSTDOC_CRATE) $$(RUSTDOC_INPUTS) \
90+
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X): \
91+
$$(RUSTI_CRATE) $$(RUSTI_INPUTS) \
9292
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
9393
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
9494
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
9595
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
9696
@$$(call E, compile_and_link: $$@)
9797
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
9898

99-
$$(HBIN$(2)_H_$(4))/rustdoc$$(X): \
100-
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X) \
99+
$$(HBIN$(2)_H_$(4))/rusti$$(X): \
100+
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X) \
101101
$$(HSREQ$(2)_H_$(4))
102102
@$$(call E, cp: $$@)
103103
$$(Q)cp $$< $$@

0 commit comments

Comments
 (0)