Skip to content

Commit 8289215

Browse files
chitrachitra
authored andcommitted
---
yaml --- r: 95486 b: refs/heads/dist-snap c: bdcd29c h: refs/heads/master v: v3
1 parent c5ed489 commit 8289215

File tree

180 files changed

+4483
-1472
lines changed

Some content is hidden

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

180 files changed

+4483
-1472
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: a1b25f2f09485ccb3d5ca07e2886a9a6dc9bc16b
9+
refs/heads/dist-snap: bdcd29c6d0dea5e15c6011033e546176b0925c3a
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
src/etc/pkg/rust-logo.ico binary
88
src/rt/msvc/* -whitespace
99
src/rt/vg/* -whitespace
10+
src/rt/linenoise/* -whitespace
1011
src/rt/jemalloc/**/* -whitespace

branches/dist-snap/Makefile.in

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,19 +221,22 @@ CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
221221
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)
224+
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
224225

225226
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
226227
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
227228
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
228229
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
229230
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
230231
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
232+
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
231233
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
232234
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
233235
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
234236
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
235237
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
236238
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
239+
LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
237240

238241
endef
239242

@@ -440,14 +443,17 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
440443
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
441444
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
442445
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
446+
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
443447
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
444448
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
449+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
445450
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
446451
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
447452
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
448453
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
449454
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
450-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
455+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
456+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \
451457

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

branches/dist-snap/RELEASES.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
Version 0.9 (XXX 2013)
2-
--------------------------
3-
4-
* ~XXX changes, numerous bugfixes
5-
6-
* Tooling
7-
* The `rust` and `rusti` commands have been removed, due to lack of maintenance.
8-
91
Version 0.8 (September 2013)
102
--------------------------
113

branches/dist-snap/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ do
686686
make_dir $t/rt/libuv/src/ev
687687
make_dir $t/rt/jemalloc
688688
for i in \
689-
isaac sync test \
689+
isaac linenoise sync test \
690690
arch/i386 arch/x86_64 arch/arm arch/mips \
691691
sundown/src sundown/html
692692
do

branches/dist-snap/doc/po/ja/rust.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1842,7 +1842,7 @@ msgid ""
18421842
"The type parameters can also be explicitly supplied in a trailing [path]"
18431843
"(#paths) component after the function name. This might be necessary if there "
18441844
"is not sufficient context to determine the type parameters. For example, "
1845-
"`mem::size_of::<u32>() == 4`."
1845+
"`sys::size_of::<u32>() == 4`."
18461846
msgstr ""
18471847

18481848
#. type: Plain text

branches/dist-snap/doc/po/ja/tutorial-ffi.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ msgid ""
327327
"impl<T: Send> Unique<T> {\n"
328328
" pub fn new(value: T) -> Unique<T> {\n"
329329
" unsafe {\n"
330-
" let ptr = malloc(std::mem::size_of::<T>() as size_t) as *mut T;\n"
330+
" let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;\n"
331331
" assert!(!ptr::is_null(ptr));\n"
332332
" // `*ptr` is uninitialized, and `*ptr = value` would attempt to destroy it\n"
333333
" intrinsics::move_val_init(&mut *ptr, value);\n"

branches/dist-snap/doc/po/rust.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1842,7 +1842,7 @@ msgid ""
18421842
"The type parameters can also be explicitly supplied in a trailing [path]"
18431843
"(#paths) component after the function name. This might be necessary if there "
18441844
"is not sufficient context to determine the type parameters. For example, "
1845-
"`mem::size_of::<u32>() == 4`."
1845+
"`sys::size_of::<u32>() == 4`."
18461846
msgstr ""
18471847

18481848
#. type: Plain text

branches/dist-snap/doc/po/tutorial-ffi.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ msgid ""
327327
"impl<T: Send> Unique<T> {\n"
328328
" pub fn new(value: T) -> Unique<T> {\n"
329329
" unsafe {\n"
330-
" let ptr = malloc(std::mem::size_of::<T>() as size_t) as *mut T;\n"
330+
" let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;\n"
331331
" assert!(!ptr::is_null(ptr));\n"
332332
" // `*ptr` is uninitialized, and `*ptr = value` would attempt to destroy it\n"
333333
" intrinsics::move_val_init(&mut *ptr, value);\n"

branches/dist-snap/doc/rust.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ with `int`, and require the closure parameter to have type
975975
The type parameters can also be explicitly supplied in a trailing
976976
[path](#paths) component after the function name. This might be necessary
977977
if there is not sufficient context to determine the type parameters. For
978-
example, `mem::size_of::<u32>() == 4`.
978+
example, `sys::size_of::<u32>() == 4`.
979979

980980
Since a parameter type is opaque to the generic function, the set of
981981
operations that can be performed on it is limited. Values of parameter
@@ -1589,7 +1589,7 @@ explain, here's a few use cases and what they would entail.
15891589
* A crate needs a global available "helper module" to itself, but it doesn't
15901590
want to expose the helper module as a public API. To accomplish this, the root
15911591
of the crate's hierarchy would have a private module which then internally has
1592-
a "public api". Because the entire crate is a descendant of the root, then the
1592+
a "public api". Because the entire crate is an ancestor of the root, then the
15931593
entire local crate can access this private module through the second case.
15941594

15951595
* When writing unit tests for a module, it's often a common idiom to have an
@@ -1602,10 +1602,7 @@ In the second case, it mentions that a private item "can be accessed" by the
16021602
current module and its descendants, but the exact meaning of accessing an item
16031603
depends on what the item is. Accessing a module, for example, would mean looking
16041604
inside of it (to import more items). On the other hand, accessing a function
1605-
would mean that it is invoked. Additionally, path expressions and import
1606-
statements are considered to access an item in the sense that the
1607-
import/expression is only valid if the destination is in the current visibility
1608-
scope.
1605+
would mean that it is invoked.
16091606

16101607
Here's an example of a program which exemplifies the three cases outlined above.
16111608

@@ -2070,10 +2067,6 @@ The currently implemented features of the compiler are:
20702067
For now this style of variant is hidden behind a feature
20712068
flag.
20722069

2073-
* `once_fns` - Onceness guarantees a closure is only executed once. Defining a
2074-
closure as `once` is unlikely to be supported going forward. So
2075-
they are hidden behind this feature until they are to be removed.
2076-
20772070
If a feature is promoted to a language feature, then all existing programs will
20782071
start to receive compilation warnings about #[feature] directives which enabled
20792072
the new feature (because the directive is no longer necessary). However, if

branches/dist-snap/doc/tutorial-ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ impl<T: Send> Unique<T> {
300300
#[inline(never)];
301301
302302
unsafe {
303-
let ptr = malloc(std::mem::size_of::<T>() as size_t) as *mut T;
303+
let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;
304304
assert!(!ptr::is_null(ptr));
305305
// `*ptr` is uninitialized, and `*ptr = value` would attempt to destroy it
306306
intrinsics::move_val_init(&mut *ptr, value);

branches/dist-snap/doc/tutorial.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ for more information on them.
113113

114114
When complete, `make install` will place several programs into
115115
`/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
116-
API-documentation tool; and `rustpkg`, the Rust package manager.
116+
API-documentation tool; `rustpkg`, the Rust package manager;
117+
`rusti`, the Rust REPL; and `rust`, a tool which acts both as a unified
118+
interface for them, and for a few common command line scenarios.
117119

118120
[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz
119121
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe

branches/dist-snap/man/rustc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ To build an executable with debug info (experimental):
130130

131131
.SH "SEE ALSO"
132132

133-
rustdoc, rustpkg
133+
rust, rustdoc, rustpkg, rusti
134134

135135
.SH "BUGS"
136136
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.

branches/dist-snap/man/rustdoc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The generated HTML can be viewed with any standard web browser.
8484

8585
.SH "SEE ALSO"
8686

87-
rustc, rustpkg
87+
rust, rustc, rustpkg, rusti
8888

8989
.SH "BUGS"
9090
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.

branches/dist-snap/man/rusti.1

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
.TH RUSTI "1" "July 2013" "rusti 0.7" "User Commands"
2+
\" Macros
3+
..
4+
.de Vb \" Begin verbatim text
5+
.ft CW
6+
.nf
7+
.ne \\$1
8+
..
9+
.de Ve \" End verbatim text
10+
.ft R
11+
.fi
12+
..
13+
.SH NAME
14+
rusti \- Rust interactive shell
15+
16+
.SH SYNOPSIS
17+
.B rusti
18+
19+
.SH DESCRIPTION
20+
21+
This program is a REPL (Read-Eval-Print Loop) for the Rust language, available
22+
at <\fBhttps://www.rust-lang.org\fR>. It provides an interactive shell to
23+
evaluate Rust expressions, functions and code snippets, and to experiment with
24+
Rust code.
25+
26+
.B WARNING:
27+
The Rust REPL is experimental and may be unstable. If you encounter problems,
28+
please use the compiler instead.
29+
30+
.SH OPTIONS
31+
32+
Currently none.
33+
34+
.SH SPECIAL COMMANDS
35+
36+
The interactive shell evaluates all input as a sequence of Rust expressions,
37+
except for a set of special commands prefixed by a colon ':'. These special
38+
commands are described below:
39+
40+
.TP
41+
\fB:help\fR
42+
Display a summary of available commands.
43+
.TP
44+
\fB:{\\n ..lines.. \\n:}\\n\fR
45+
execute multiline command
46+
.TP
47+
\fB:load <crate> ...\fR
48+
loads given crates as dynamic libraries
49+
.TP
50+
\fB:clear\fR
51+
clear the bindings
52+
.TP
53+
\fB:exit\fR
54+
exit from the repl
55+
56+
.SH "EXAMPLES"
57+
58+
A simple example session, declaring a variable, defining a function,
59+
evaluating an expression and printing the result:
60+
61+
.PP
62+
.Vb
63+
\& \fBrusti>\fR let x = 42;
64+
\& \fBrusti>\fR fn square(n: int) -> int { n*n }
65+
\& \fBrusti>\fR println(fmt!("%d squared is %d", x, square(x)));
66+
\& 42 squared is 1764
67+
.Ve
68+
69+
.SH "SEE ALSO"
70+
71+
rust, rustc, rustdoc, rustpkg
72+
73+
.SH "BUGS"
74+
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
75+
76+
.SH "AUTHOR"
77+
See \fBAUTHORS.txt\fR in the rust source distribution. Graydon Hoare
78+
<\fI[email protected]\fR> is the project leader.
79+
80+
.SH "COPYRIGHT"
81+
This work is dual-licensed under Apache 2.0 and MIT terms. See \fBCOPYRIGHT\fR
82+
file in the rust source distribution.

branches/dist-snap/man/rustpkg.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ custom build logic.
181181

182182
.SH "SEE ALSO"
183183

184-
rustc, rustdoc
184+
rust, rustc, rustdoc, rusti
185185

186186
.SH "BUGS"
187187
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.

branches/dist-snap/mk/clean.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ clean$(1)_H_$(2):
6767
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustpkg$(X_$(2))
6868
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X_$(2))
6969
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X_$(2))
70+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X_$(2))
7071
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X_$(2))
7172
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
7273
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC_$(2))
@@ -75,12 +76,14 @@ clean$(1)_H_$(2):
7576
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_EXTRALIB_$(2))
7677
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC_$(2))
7778
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX_$(2))
79+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTI_$(2))
7880
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB_$(2))
7981
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_GLOB_$(2))
8082
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
8183
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
8284
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
8385
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB_$(2))
86+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB_$(2))
8487
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM_$(2))
8588
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
8689

@@ -97,6 +100,7 @@ clean$(1)_T_$(2)_H_$(3):
97100
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X_$(2))
98101
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X_$(2))
99102
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X_$(2))
103+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rusti$(X_$(2))
100104
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rust$(X_$(2))
101105
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))
102106
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
@@ -105,12 +109,14 @@ clean$(1)_T_$(2)_H_$(3):
105109
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
106110
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
107111
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
112+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2))
108113
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
109114
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_GLOB_$(2))
110115
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
111116
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
112117
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
113118
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
119+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTI_GLOB_$(2))
114120
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))
115121
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
116122
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a

branches/dist-snap/mk/dist.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ PKG_FILES := \
2929
README.txt \
3030
driver \
3131
librustpkg \
32+
librusti \
3233
librustc \
3334
compiletest \
3435
etc \

branches/dist-snap/mk/install.mk

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
104104
$$(Q)$$(call INSTALL_LIB,$$(LIBSYNTAX_GLOB_$(1)))
105105
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTPKG_GLOB_$(1)))
106106
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTDOC_GLOB_$(1)))
107+
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTI_GLOB_$(1)))
107108
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
108109

109110
endef
@@ -137,16 +138,19 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
137138
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD_TRIPLE)))
138139
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD_TRIPLE)))
139140
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
141+
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X_$(CFG_BUILD_TRIPLE)))
140142
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
141143
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE)))
142144
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
143145
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE)))
146+
$(Q)$(call INSTALL_LIB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE)))
144147
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE)))
145148
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE)))
146149
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE)))
147150
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE)))
148151
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustc.1)
149152
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustdoc.1)
153+
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rusti.1)
150154
$(Q)$(call INSTALL,$(S)/man, $(PREFIX_ROOT)/share/man/man1,rustpkg.1)
151155

152156
install-targets: $(INSTALL_TARGET_RULES)
@@ -158,6 +162,7 @@ HOST_LIB_FROM_HL_GLOB = \
158162
uninstall:
159163
$(Q)rm -f $(PHB)/rustc$(X_$(CFG_BUILD_TRIPLE))
160164
$(Q)rm -f $(PHB)/rustpkg$(X_$(CFG_BUILD_TRIPLE))
165+
$(Q)rm -f $(PHB)/rusti$(X_$(CFG_BUILD_TRIPLE))
161166
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD_TRIPLE))
162167
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
163168
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
@@ -168,12 +173,14 @@ uninstall:
168173
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE))) \
169174
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
170175
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE))) \
176+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE))) \
171177
; \
172178
do rm -f $$i ; \
173179
done
174180
$(Q)rm -Rf $(PHL)/rustc
175181
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustc.1
176182
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustdoc.1
183+
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rusti.1
177184
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustpkg.1
178185

179186
# target platform specific variables

branches/dist-snap/mk/platform.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $(foreach t,$(CFG_TARGET_TRIPLES),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
2929
# FIXME: no-omit-frame-pointer is just so that task_start_wrapper
3030
# has a frame pointer and the stack walker can understand it. Turning off
3131
# frame pointers everywhere is overkill
32-
CFG_GCCISH_CFLAGS += -fno-omit-frame-pointer
32+
CFG_GCCISH_CFLAGS += -fno-omit-frame-pointer -DUSE_UTF8
3333

3434
# On Darwin, we need to run dsymutil so the debugging information ends
3535
# up in the right place. On other platforms, it automatically gets

0 commit comments

Comments
 (0)