Skip to content

Commit 1b0c666

Browse files
brsonbrson
committed
Merge remote-tracking branch 'brson/repl'
Conflicts: mk/install.mk src/rt/rustrt.def.in
2 parents 45a908c + 799eb10 commit 1b0c666

24 files changed

+2298
-33
lines changed

‎AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Benjamin Peterson <[email protected]>
2323
Brendan Eich <[email protected]>
2424
Brian Anderson <[email protected]>
2525
Brian J. Burg <[email protected]>
26+
Brian Leibig <[email protected]>
2627
Chris Double <[email protected]>
2728
Chris Peterson <[email protected]>
2829
Damian Gryski <[email protected]>

‎Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,9 @@ TSREQS := \
460460
FUZZ := $(HBIN2_H_$(CFG_HOST_TRIPLE))/fuzzer$(X)
461461
CARGO := $(HBIN2_H_$(CFG_HOST_TRIPLE))/cargo$(X)
462462
RUSTDOC := $(HBIN2_H_$(CFG_HOST_TRIPLE))/rustdoc$(X)
463+
RUSTI := $(HBIN2_H_$(CFG_HOST_TRIPLE))/rusti$(X)
463464

464-
all: rustc $(GENERATED) docs $(FUZZ) $(CARGO) $(RUSTDOC)
465+
all: rustc $(GENERATED) docs $(FUZZ) $(CARGO) $(RUSTDOC) $(RUSTI)
465466

466467
endif
467468

‎configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ for t in $CFG_TARGET_TRIPLES
529529
do
530530
make_dir rt/$t
531531
for i in \
532-
isaac bigint sync test arch/i386 arch/x86_64 \
532+
isaac linenoise bigint sync test arch/i386 arch/x86_64 \
533533
libuv libuv/src/ares libuv/src/eio libuv/src/ev
534534
do
535535
make_dir rt/$t/$i

‎mk/dist.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ PKG_FILES := \
2222
$(addprefix $(S)src/, \
2323
README.txt \
2424
cargo \
25+
rusti \
2526
rustc \
2627
compiletest \
2728
etc \

‎mk/install.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
7575
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBFUZZER))
7676
$(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X))
7777
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBCARGO))
78+
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
7879
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
7980
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC))
8081
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
@@ -95,6 +96,7 @@ HOST_LIB_FROM_HL_GLOB = \
9596
uninstall:
9697
$(Q)rm -f $(PHB)/rustc$(X)
9798
$(Q)rm -f $(PHB)/cargo$(X)
99+
$(Q)rm -f $(PHB)/rusti$(X)
98100
$(Q)rm -f $(PHB)/rustdoc$(X)
99101
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
100102
$(Q)rm -f $(PHL)/$(CFG_FUZZER)

‎mk/platform.mk

Lines changed: 50 additions & 23 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
@@ -212,24 +212,37 @@ ifeq ($(CFG_C_COMPILER),clang)
212212
ifeq ($(origin CPP),default)
213213
CPP=clang -E
214214
endif
215-
CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
215+
CFG_GCCISH_CFLAGS += -Wall -Werror -g
216+
CFG_GCCISH_CXXFLAGS += -fno-rtti
216217
CFG_GCCISH_LINK_FLAGS += -g
217218
# These flags will cause the compiler to produce a .d file
218219
# next to the .o file that lists header deps.
219220
CFG_DEPEND_FLAGS = -MMD -MP -MT $(1) -MF $(1:%.o=%.d)
220221

221222
define CFG_MAKE_CC
222-
CFG_COMPILE_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
223-
$$(CFG_GCCISH_CFLAGS) $$(CFG_CLANG_CFLAGS) \
224-
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
225-
$$(CFG_CLANG_CFLAGS_$$(HOST_$(1))) \
223+
CFG_COMPILE_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CC) \
224+
$$(CFG_GCCISH_CFLAGS) $$(CFG_CLANG_CFLAGS) \
225+
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
226+
$$(CFG_CLANG_CFLAGS_$$(HOST_$(1))) \
226227
$$(CFG_DEPEND_FLAGS) \
227-
-c -o $$(1) $$(2)
228-
CFG_LINK_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
229-
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
230-
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
231-
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
232-
$$(call CFG_INSTALL_NAME,$$(4))
228+
-c -o $$(1) $$(2)
229+
CFG_LINK_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CC) \
230+
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
231+
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
232+
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
233+
$$(call CFG_INSTALL_NAME,$$(4))
234+
CFG_COMPILE_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
235+
$$(CFG_GCCISH_CFLAGS) $$(CFG_CLANG_CFLAGS) \
236+
$$(CFG_GCCISH_CXXFLAGS) \
237+
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
238+
$$(CFG_CLANG_CFLAGS_$$(HOST_$(1))) \
239+
$$(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))
233246
endef
234247

235248
$(foreach target,$(CFG_TARGET_TRIPLES), \
@@ -245,24 +258,38 @@ ifeq ($(CFG_C_COMPILER),gcc)
245258
ifeq ($(origin CPP),default)
246259
CPP=gcc -E
247260
endif
248-
CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
261+
CFG_GCCISH_CFLAGS += -Wall -Werror -g
262+
CFG_GCCISH_CXXFLAGS += -fno-rtti
249263
CFG_GCCISH_LINK_FLAGS += -g
250264
# These flags will cause the compiler to produce a .d file
251265
# next to the .o file that lists header deps.
252266
CFG_DEPEND_FLAGS = -MMD -MP -MT $(1) -MF $(1:%.o=%.d)
253267

254268
define CFG_MAKE_CC
255-
CFG_COMPILE_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
256-
$$(CFG_GCCISH_CFLAGS) \
257-
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
258-
$$(CFG_GCC_CFLAGS) \
259-
$$(CFG_GCC_CFLAGS_$$(HOST_$(1))) \
269+
CFG_COMPILE_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CC) \
270+
$$(CFG_GCCISH_CFLAGS) \
271+
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
272+
$$(CFG_GCC_CFLAGS) \
273+
$$(CFG_GCC_CFLAGS_$$(HOST_$(1))) \
274+
$$(CFG_DEPEND_FLAGS) \
275+
-c -o $$(1) $$(2)
276+
CFG_LINK_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CC) \
277+
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
278+
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
279+
$$(CFG_GCCISH_DEF_FLAG)$$(3) $$(2) \
280+
$$(call CFG_INSTALL_NAME,$$(4))
281+
CFG_COMPILE_CXX_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
282+
$$(CFG_GCCISH_CFLAGS) \
283+
$$(CFG_GCCISH_CXXFLAGS) \
284+
$$(CFG_GCCISH_CFLAGS_$$(HOST_$(1))) \
285+
$$(CFG_GCC_CFLAGS) \
286+
$$(CFG_GCC_CFLAGS_$$(HOST_$(1))) \
260287
$$(CFG_DEPEND_FLAGS) \
261288
-c -o $$(1) $$(2)
262-
CFG_LINK_C_$(1) = $$(CFG_GCCISH_CROSS)$$(CXX) \
263-
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
264-
$$(CFG_GCCISH_LINK_FLAGS_$$(HOST_$(1))) \
265-
$$(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) \
266293
$$(call CFG_INSTALL_NAME,$$(4))
267294
endef
268295

@@ -285,4 +312,4 @@ define CFG_MAKE_ASSEMBLER
285312
endef
286313

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

‎mk/pp.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ 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) \
12+
$(wildcard $(S)src/rusti/*.rs)
1213

1314
PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L \
1415
"no-reformat\|xfail-pretty\|xfail-test")

‎mk/rt.mk

Lines changed: 14 additions & 5 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 \
@@ -77,6 +77,8 @@ RUNTIME_CS_$(1) := \
7777
rt/arch/$$(HOST_$(1))/context.cpp \
7878
rt/arch/$$(HOST_$(1))/gpr.cpp
7979

80+
RUNTIME_CS_$(1) := rt/linenoise/linenoise.c rt/linenoise/utf8.c
81+
8082
RUNTIME_S_$(1) := rt/arch/$$(HOST_$(1))/_context.S \
8183
rt/arch/$$(HOST_$(1))/ccall.S \
8284
rt/arch/$$(HOST_$(1))/record_sp.S
@@ -103,9 +105,11 @@ endif
103105

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

@@ -115,6 +119,11 @@ ALL_OBJ_FILES += $$(MORESTACK_OBJS_$(1))
115119
RUNTIME_LIBS_$(1) := $$(LIBUV_LIB_$(1))
116120

117121
rt/$(1)/%.o: rt/%.cpp $$(MKFILE_DEPS)
122+
@$$(call E, compile: $$@)
123+
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, $$(RUNTIME_INCS_$(1)) \
124+
$$(SNAP_DEFINES)) $$<
125+
126+
rt/$(1)/%.o: rt/%.c $$(MKFILE_DEPS)
118127
@$$(call E, compile: $$@)
119128
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(RUNTIME_INCS_$(1)) \
120129
$$(SNAP_DEFINES)) $$<
@@ -132,7 +141,7 @@ rt/$(1)/$(CFG_RUNTIME): $$(RUNTIME_OBJS_$(1)) $$(MKFILE_DEPS) \
132141
$$(RUNTIME_DEF_$(1)) \
133142
$$(RUNTIME_LIBS_$(1))
134143
@$$(call E, link: $$@)
135-
$$(Q)$$(call CFG_LINK_C_$(1),$$@, $$(RUNTIME_OBJS_$(1)) \
144+
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)) \
136145
$$(CFG_GCCISH_POST_LIB_FLAGS) $$(RUNTIME_LIBS_$(1)) \
137146
$$(CFG_LIBUV_LINK_FLAGS),$$(RUNTIME_DEF_$(1)),$$(CFG_RUNTIME))
138147

‎mk/rustllvm.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ ALL_OBJ_FILES += $$(RUSTLLVM_OBJS_OBJS_$(1))
2525
rustllvm/$(1)/$(CFG_RUSTLLVM): $$(RUSTLLVM_OBJS_OBJS_$(1)) \
2626
$$(MKFILE_DEPS) $$(RUSTLLVM_DEF_$(1))
2727
@$$(call E, link: $$@)
28-
$$(Q)$$(call CFG_LINK_C_$(1),$$@,$$(RUSTLLVM_OBJS_OBJS_$(1)) \
28+
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@,$$(RUSTLLVM_OBJS_OBJS_$(1)) \
2929
$$(CFG_GCCISH_PRE_LIB_FLAGS) $$(LLVM_LIBS_$(1)) \
3030
$$(CFG_GCCISH_POST_LIB_FLAGS) \
3131
$$(LLVM_LDFLAGS_$(1)),$$(RUSTLLVM_DEF_$(1)),$$(CFG_RUSTLLVM))
3232

3333
rustllvm/$(1)/%.o: rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
3434
@$$(call E, compile: $$@)
35-
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, $$(LLVM_CXXFLAGS_$(1)) $$(RUSTLLVM_INCS_$(1))) $$<
35+
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, $$(LLVM_CXXFLAGS_$(1)) $$(RUSTLLVM_INCS_$(1))) $$<
3636
endef
3737

3838
# Instantiate template for all stages

‎mk/tests.mk

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ ALL_CS := $(wildcard $(S)src/rt/*.cpp \
122122
ALL_CS := $(filter-out $(S)src/rt/bigint/bigint_ext.cpp \
123123
$(S)src/rt/bigint/bigint_int.cpp \
124124
$(S)src/rt/miniz.cpp \
125+
$(S)src/rt/linenoise/linenoise.c \
125126
,$(ALL_CS))
126127
ALL_HS := $(wildcard $(S)src/rt/*.h \
127128
$(S)src/rt/*/*.h \
@@ -135,6 +136,7 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
135136
$(S)src/rt/msvc/stdint.h \
136137
$(S)src/rt/msvc/inttypes.h \
137138
$(S)src/rt/bigint/bigint.h \
139+
$(S)src/rt/linenoise/linenoise.h \
138140
,$(ALL_HS))
139141

140142
tidy:
@@ -229,6 +231,7 @@ check-stage$(1)-T-$(2)-H-$(3): \
229231
check-stage$(1)-T-$(2)-H-$(3)-bench \
230232
check-stage$(1)-T-$(2)-H-$(3)-pretty \
231233
check-stage$(1)-T-$(2)-H-$(3)-rustdoc \
234+
check-stage$(1)-T-$(2)-H-$(3)-rusti \
232235
check-stage$(1)-T-$(2)-H-$(3)-cargo \
233236
check-stage$(1)-T-$(2)-H-$(3)-doc-tutorial \
234237
check-stage$(1)-T-$(2)-H-$(3)-doc-tutorial-ffi \
@@ -289,6 +292,9 @@ check-stage$(1)-T-$(2)-H-$(3)-pretty-pretty: \
289292
check-stage$(1)-T-$(2)-H-$(3)-rustdoc: \
290293
check-stage$(1)-T-$(2)-H-$(3)-rustdoc-dummy
291294

295+
check-stage$(1)-T-$(2)-H-$(3)-rusti: \
296+
check-stage$(1)-T-$(2)-H-$(3)-rusti-dummy
297+
292298
check-stage$(1)-T-$(2)-H-$(3)-cargo: \
293299
check-stage$(1)-T-$(2)-H-$(3)-cargo-dummy
294300

@@ -371,6 +377,24 @@ check-stage$(1)-T-$(2)-H-$(3)-rustdoc-dummy: \
371377
$$(Q)$$(call CFG_RUN_TEST,$$<,$(2),$(3)) $$(TESTARGS) \
372378
--logfile tmp/check-stage$(1)-T-$(2)-H-$(3)-rustdoc.log
373379

380+
# Rules for the rusti test runner
381+
382+
$(3)/test/rustitest.stage$(1)-$(2)$$(X): \
383+
$$(RUSTI_CRATE) $$(RUSTI_INPUTS) \
384+
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
385+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
386+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \
387+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
388+
@$$(call E, compile_and_link: $$@)
389+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
390+
391+
check-stage$(1)-T-$(2)-H-$(3)-rusti-dummy: \
392+
$(3)/test/rustitest.stage$(1)-$(2)$$(X)
393+
@$$(call E, run: $$<)
394+
$$(Q)$$(call CFG_RUN_TEST,$$<,$(2),$(3)) $$(TESTARGS) \
395+
--logfile tmp/check-stage$(1)-T-$(2)-H-$(3)-rusti.log
396+
397+
374398
# Rules for the cargo test runner
375399

376400
$(3)/test/cargotest.stage$(1)-$(2)$$(X): \
@@ -756,6 +780,9 @@ check-stage$(1)-H-$(2)-pretty-pretty: \
756780
check-stage$(1)-H-$(2)-rustdoc: \
757781
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
758782
check-stage$(1)-T-$$(target)-H-$(2)-rustdoc)
783+
check-stage$(1)-H-$(2)-rusti: \
784+
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
785+
check-stage$(1)-T-$$(target)-H-$(2)-rusti)
759786
check-stage$(1)-H-$(2)-cargo: \
760787
$$(foreach target,$$(CFG_TARGET_TRIPLES), \
761788
check-stage$(1)-T-$$(target)-H-$(2)-cargo)

‎mk/tools.mk

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ CARGO_INPUTS := $(wildcard $(S)src/cargo/*rs)
1818
RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rc
1919
RUSTDOC_INPUTS := $(wildcard $(S)src/rustdoc/*.rs)
2020

21+
# Rusti, the JIT REPL
22+
RUSTI_CRATE := $(S)src/rusti/rusti.rc
23+
RUSTI_INPUTS := $(wildcard $(S)src/rusti/*.rs)
24+
2125
# FIXME: These are only built for the host arch. Eventually we'll
2226
# have tools that need to built for other targets.
2327
define TOOLS_STAGE_N
@@ -126,6 +130,21 @@ $$(HBIN$(2)_H_$(4))/rustdoc$$(X): \
126130
@$$(call E, cp: $$@)
127131
$$(Q)cp $$< $$@
128132

133+
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X): \
134+
$$(RUSTI_CRATE) $$(RUSTI_INPUTS) \
135+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
136+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
137+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
138+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
139+
@$$(call E, compile_and_link: $$@)
140+
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
141+
142+
$$(HBIN$(2)_H_$(4))/rusti$$(X): \
143+
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X) \
144+
$$(HSREQ$(2)_H_$(4))
145+
@$$(call E, cp: $$@)
146+
$$(Q)cp $$< $$@
147+
129148
endef
130149

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

‎src/README.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ compiletest/ The test runner
3030

3131
cargo/ The package manager
3232

33+
rusti/ The JIT REPL
34+
3335
rustdoc/ The Rust API documentation tool
3436

3537
llvm/ The LLVM submodule

0 commit comments

Comments
 (0)