Skip to content

Commit ce47732

Browse files
borsbors
committed
---
yaml --- r: 153927 b: refs/heads/try2 c: 28ae6f5 h: refs/heads/master i: 153925: cde2de0 153923: 9dc2817 153919: 79cc5b1 v: v3
1 parent 28904b0 commit ce47732

File tree

1,185 files changed

+50523
-39820
lines changed

Some content is hidden

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

1,185 files changed

+50523
-39820
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: c614510ddb0eca24ee102511feb69a159238a996
8+
refs/heads/try2: 28ae6f53299495019b6bac8c1bba2bcbb19de15c
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ src/etc/pkg/rust-logo.ico binary
88
src/etc/pkg/rust-logo.png binary
99
src/rt/msvc/* -whitespace
1010
src/rt/valgrind/* -whitespace
11+
*.woff binary

‎branches/try2/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ src/etc/dl
8686
.settings/
8787
/build
8888
i686-pc-mingw32/
89-
src/librustc/lib/llvmdeps.rs
89+
src/librustc_llvm/llvmdeps.rs
9090
*.pot

‎branches/try2/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ ifneq ($(strip $(findstring check,$(MAKECMDGOALS)) \
216216
$(findstring tidy,$(MAKECMDGOALS))),)
217217
CFG_INFO := $(info cfg: including test rules)
218218
include $(CFG_SRC_DIR)mk/tests.mk
219+
include $(CFG_SRC_DIR)mk/grammar.mk
219220
endif
220221

221222
# Performance and benchmarking

‎branches/try2/RELEASES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ Version 0.9 (January 2014)
306306
* A new facility for enabling experimental features (feature gating) has
307307
been added, using the crate-level `#[feature(foo)]` attribute.
308308
* Managed boxes (@) are now behind a feature gate
309-
(`#[feature(managed_boxes)]`) in preperation for future removal. Use the
309+
(`#[feature(managed_boxes)]`) in preparation for future removal. Use the
310310
standard library's `Gc` or `Rc` types instead.
311311
* `@mut` has been removed. Use `std::cell::{Cell, RefCell}` instead.
312312
* Jumping back to the top of a loop is now done with `continue` instead of
@@ -398,7 +398,7 @@ Version 0.9 (January 2014)
398398
* std: `fmt::Default` can be implemented for any type to provide default
399399
formatting to the `format!` macro, as in `format!("{}", myfoo)`.
400400
* std: The `rand` API continues to be tweaked.
401-
* std: The `rust_begin_unwind` function, useful for insterting breakpoints
401+
* std: The `rust_begin_unwind` function, useful for inserting breakpoints
402402
on failure in gdb, is now named `rust_fail`.
403403
* std: The `each_key` and `each_value` methods on `HashMap` have been
404404
replaced by the `keys` and `values` iterators.
@@ -429,7 +429,7 @@ Version 0.9 (January 2014)
429429
extensible interfaces and is now implemented by two different crates:
430430
libnative, for native threading and I/O; and libgreen, for green threading
431431
and I/O. This paves the way for using the standard library in more limited
432-
embeded environments.
432+
embedded environments.
433433
* std: The `comm` module has been rewritten to be much faster, have a
434434
simpler, more consistent API, and to work for both native and green
435435
threading.

‎branches/try2/configure

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,10 +418,12 @@ opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
418418
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
419419
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
420420
opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
421-
opt rpath 1 "build rpaths into rustc itself"
421+
opt rpath 0 "build rpaths into rustc itself"
422422
opt nightly 0 "build nightly packages"
423423
opt verify-install 1 "verify installed binaries work"
424424
opt jemalloc 1 "build liballoc with jemalloc"
425+
# This is used by the automation to produce single-target nightlies
426+
opt dist-host-only 0 "only install bins for the host architecture"
425427
valopt prefix "/usr/local" "set installation prefix"
426428
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
427429
valopt llvm-root "" "set LLVM root"
@@ -493,6 +495,9 @@ probe CFG_VALGRIND valgrind
493495
probe CFG_PERF perf
494496
probe CFG_ISCC iscc
495497
probe CFG_LLNEXTGEN LLnextgen
498+
probe CFG_JAVAC javac
499+
probe CFG_ANTLR4 antlr4
500+
probe CFG_GRUN grun
496501
probe CFG_PANDOC pandoc
497502
probe CFG_PDFLATEX pdflatex
498503
probe CFG_XELATEX xelatex

‎branches/try2/man/rustc.1

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTC "1" "March 2014" "rustc 0.11-pre" "User Commands"
1+
.TH RUSTC "1" "March 2014" "rustc 0.12.0-pre" "User Commands"
22
.SH NAME
33
rustc \- The Rust compiler
44
.SH SYNOPSIS
@@ -11,6 +11,9 @@ This program is a compiler for the Rust language, available at
1111

1212
.SH OPTIONS
1313

14+
.TP
15+
\fB\-\-crate-name NAME\fR
16+
Specify the name of the crate being built
1417
.TP
1518
\fB\-\-crate-type=[bin|lib|dylib|rlib|staticlib]\fR
1619
Configure the flavor of rust crate that is generated (default `bin`)
@@ -60,11 +63,12 @@ Parse only; do not compile, assemble, or link
6063
\fB\-\-pretty\fR [TYPE]
6164
Pretty-print the input instead of compiling; valid types are: normal
6265
(un-annotated source), expanded (crates expanded), typed (crates
63-
expanded, with type annotations), or identified (fully parenthesized,
64-
AST nodes and blocks with IDs)
66+
expanded, with type annotations), identified (fully parenthesized,
67+
AST nodes and blocks with IDs), or flowgraph=<nodeid> (graphviz
68+
formatted flowgraph for node)
6569
.TP
6670
\fB\-\-dep-info\fR [FILENAME]
67-
Output dependency info to <filename> after compiling, in o format suitable
71+
Output dependency info to <filename> after compiling, in a format suitable
6872
for use by Makefiles.
6973
.TP
7074
\fB\-\-sysroot\fR PATH
@@ -138,8 +142,8 @@ A space-separated list of arguments to pass through to LLVM.
138142
If specified, the compiler will save more files (.bc, .o, .no-opt.bc) generated
139143
throughout compilation in the output directory.
140144
.TP
141-
\fBno-rpath\fR
142-
If specified, then the rpath value for dynamic libraries will not be set in
145+
\fBrpath\fR
146+
If specified, then the rpath value for dynamic libraries will be set in
143147
either dynamic library or executable outputs.
144148
.TP
145149
\fBno-prepopulate-passes\fR

‎branches/try2/man/rustdoc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTDOC "1" "March 2014" "rustdoc 0.11-pre" "User Commands"
1+
.TH RUSTDOC "1" "March 2014" "rustdoc 0.12.0-pre" "User Commands"
22
.SH NAME
33
rustdoc \- generate documentation from Rust source code
44
.SH SYNOPSIS

‎branches/try2/mk/clean.mk

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
# Cleanup
1313
######################################################################
1414

15-
CLEAN_STAGE_RULES := \
16-
$(foreach stage, $(STAGES), \
17-
$(foreach host, $(CFG_HOST), \
18-
clean$(stage)_H_$(host) \
19-
$(foreach target, $(CFG_TARGET), \
15+
CLEAN_STAGE_RULES := \
16+
$(foreach stage, $(STAGES), \
17+
$(foreach host, $(CFG_HOST), \
18+
clean$(stage)_H_$(host) \
19+
$(foreach target, $(CFG_TARGET), \
2020
clean$(stage)_T_$(target)_H_$(host))))
2121

22-
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
22+
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
2323
$(foreach host, $(CFG_HOST), clean-generic-H-$(host))
2424

25-
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
25+
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
2626
$(foreach host, $(CFG_TARGET), clean-generic-T-$(host))
2727

28-
CLEAN_LLVM_RULES = \
29-
$(foreach target, $(CFG_HOST), \
28+
CLEAN_LLVM_RULES = \
29+
$(foreach target, $(CFG_HOST), \
3030
clean-llvm$(target))
3131

3232
.PHONY: clean clean-all clean-misc clean-llvm
@@ -54,20 +54,20 @@ clean-generic-$(2)-$(1):
5454
$(1)/rt \
5555
$(1)/test \
5656
$(1)/stage* \
57-
-type f \( \
57+
-type f \( \
5858
-name '*.[odasS]' -o \
59-
-name '*.so' -o \
60-
-name '*.dylib' -o \
61-
-name '*.rlib' -o \
62-
-name 'stamp.*' -o \
63-
-name '*.lib' -o \
64-
-name '*.dll' -o \
65-
-name '*.def' -o \
66-
-name '*.bc' \
67-
\) \
59+
-name '*.so' -o \
60+
-name '*.dylib' -o \
61+
-name '*.rlib' -o \
62+
-name 'stamp.*' -o \
63+
-name '*.lib' -o \
64+
-name '*.dll' -o \
65+
-name '*.def' -o \
66+
-name '*.bc' \
67+
\) \
6868
| xargs rm -f
69-
$(Q)find $(1)\
70-
-name '*.dSYM' \
69+
$(Q)find $(1) \
70+
-name '*.dSYM' \
7171
| xargs rm -Rf
7272
endef
7373

@@ -76,8 +76,8 @@ $(foreach targ, $(CFG_TARGET), $(eval $(call CLEAN_GENERIC,$(targ),T)))
7676

7777
define CLEAN_HOST_STAGE_N
7878

79-
clean$(1)_H_$(2): \
80-
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
79+
clean$(1)_H_$(2): \
80+
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
8181
$$(foreach tool,$$(TOOLS),clean$(1)_H_$(2)-tool-$$(tool))
8282
$$(Q)rm -fr $(2)/rt/libbacktrace
8383

@@ -96,8 +96,8 @@ $(foreach host, $(CFG_HOST), \
9696

9797
define CLEAN_TARGET_STAGE_N
9898

99-
clean$(1)_T_$(2)_H_$(3): \
100-
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
99+
clean$(1)_T_$(2)_H_$(3): \
100+
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
101101
$$(foreach tool,$$(TOOLS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
102102
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
103103
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a

‎branches/try2/mk/crates.mk

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,30 @@
5151

5252
TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
5353
uuid serialize sync getopts collections num test time rand \
54-
url log regex graphviz core rlibc alloc debug rustrt
55-
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros
54+
url log regex graphviz core rlibc alloc debug rustrt \
55+
unicode
56+
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros \
57+
rustc_llvm rustc_back
5658
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5759
TOOLS := compiletest rustdoc rustc
5860

5961
DEPS_core :=
6062
DEPS_rlibc :=
63+
DEPS_unicode := core
6164
DEPS_alloc := core libc native:jemalloc
6265
DEPS_debug := std
6366
DEPS_rustrt := alloc core libc collections native:rustrt_native
64-
DEPS_std := core libc rand alloc collections rustrt sync \
67+
DEPS_std := core libc rand alloc collections rustrt sync unicode \
6568
native:rust_builtin native:backtrace
6669
DEPS_graphviz := std
6770
DEPS_green := std native:context_switch
6871
DEPS_rustuv := std native:uv native:uv_support
6972
DEPS_native := std
7073
DEPS_syntax := std term serialize log fmt_macros debug
71-
DEPS_rustc := syntax native:rustllvm flate arena serialize getopts \
72-
time log graphviz debug
74+
DEPS_rustc := syntax flate arena serialize getopts \
75+
time log graphviz debug rustc_llvm rustc_back
76+
DEPS_rustc_llvm := native:rustllvm libc std
77+
DEPS_rustc_back := std syntax rustc_llvm flate log libc
7378
DEPS_rustdoc := rustc native:hoedown serialize getopts \
7479
test time debug
7580
DEPS_flate := std native:miniz
@@ -82,7 +87,7 @@ DEPS_semver := std
8287
DEPS_uuid := std serialize
8388
DEPS_sync := core alloc rustrt collections
8489
DEPS_getopts := std
85-
DEPS_collections := core alloc
90+
DEPS_collections := core alloc unicode
8691
DEPS_fourcc := rustc syntax std
8792
DEPS_hexfloat := rustc syntax std
8893
DEPS_num := std
@@ -108,6 +113,7 @@ ONLY_RLIB_rlibc := 1
108113
ONLY_RLIB_alloc := 1
109114
ONLY_RLIB_rand := 1
110115
ONLY_RLIB_collections := 1
116+
ONLY_RLIB_unicode := 1
111117

112118
################################################################################
113119
# You should not need to edit below this line

‎branches/try2/mk/ctags.mk

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
# This is using a blacklist approach, probably more durable than a whitelist.
1919
# We exclude: external dependencies (llvm, libuv, gyp, rt/{msvc,sundown,vg}),
2020
# tests (compiletest, test) and a couple of other things (rt/arch, etc)
21-
CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,,\
22-
$(patsubst ${CFG_SRC_DIR}src/libuv,,\
23-
$(patsubst ${CFG_SRC_DIR}src/compiletest,,\
24-
$(patsubst ${CFG_SRC_DIR}src/test,,\
25-
$(patsubst ${CFG_SRC_DIR}src/gyp,,\
26-
$(patsubst ${CFG_SRC_DIR}src/etc,,\
27-
$(patsubst ${CFG_SRC_DIR}src/rt,,\
28-
$(patsubst ${CFG_SRC_DIR}src/rt/arch,,\
29-
$(patsubst ${CFG_SRC_DIR}src/rt/msvc,,\
30-
$(patsubst ${CFG_SRC_DIR}src/rt/sundown,,\
31-
$(patsubst ${CFG_SRC_DIR}src/rt/vg,,\
32-
$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*)\
21+
CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,, \
22+
$(patsubst ${CFG_SRC_DIR}src/libuv,, \
23+
$(patsubst ${CFG_SRC_DIR}src/compiletest,, \
24+
$(patsubst ${CFG_SRC_DIR}src/test,, \
25+
$(patsubst ${CFG_SRC_DIR}src/gyp,, \
26+
$(patsubst ${CFG_SRC_DIR}src/etc,, \
27+
$(patsubst ${CFG_SRC_DIR}src/rt,, \
28+
$(patsubst ${CFG_SRC_DIR}src/rt/arch,, \
29+
$(patsubst ${CFG_SRC_DIR}src/rt/msvc,, \
30+
$(patsubst ${CFG_SRC_DIR}src/rt/sundown,, \
31+
$(patsubst ${CFG_SRC_DIR}src/rt/vg,, \
32+
$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*) \
3333
)))))))))))
3434
CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=-javascript --recurse ${CTAGS_LOCATIONS}
3535
# We could use `--languages=Rust`, but there is value in producing tags for the

‎branches/try2/mk/dist.mk

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ define DEF_OSX_PKG
156156
$$(eval $$(call DEF_PREPARE,osx-$(1)))
157157

158158
dist-prepare-osx-$(1): PREPARE_HOST=$(1)
159-
dist-prepare-osx-$(1): PREPARE_TARGETS=$(1)
159+
dist-prepare-osx-$(1): PREPARE_TARGETS=$(2)
160160
dist-prepare-osx-$(1): PREPARE_DEST_DIR=tmp/dist/pkgroot-$(1)
161161
dist-prepare-osx-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
162162
dist-prepare-osx-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
@@ -187,7 +187,11 @@ tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/%
187187

188188
endef
189189

190-
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))
190+
ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
191+
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(host))))
192+
else
193+
$(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host),$(TARGET))))
194+
endif
191195

192196
dist-osx: $(foreach host,$(CFG_HOST),dist/$(PKG_NAME)-$(host).pkg)
193197

@@ -205,17 +209,19 @@ distcheck-osx: dist-osx
205209
# Unix binary installer tarballs
206210
######################################################################
207211

208-
define DEF_PREPARE_DIST_DIR
209-
210-
dist-install-dir-$(1)$(3): PREPARE_HOST=$(1)
211-
dist-install-dir-$(1)$(3): PREPARE_TARGETS=$(2)
212-
dist-install-dir-$(1)$(3): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
213-
dist-install-dir-$(1)$(3): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
214-
dist-install-dir-$(1)$(3): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
215-
dist-install-dir-$(1)$(3): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
216-
dist-install-dir-$(1)$(3): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
217-
dist-install-dir-$(1)$(3): PREPARE_CLEAN=true
218-
dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs
212+
define DEF_INSTALLER
213+
214+
$$(eval $$(call DEF_PREPARE,dir-$(1)))
215+
216+
dist-install-dir-$(1): PREPARE_HOST=$(1)
217+
dist-install-dir-$(1): PREPARE_TARGETS=$(2)
218+
dist-install-dir-$(1): PREPARE_DEST_DIR=tmp/dist/$$(PKG_NAME)-$(1)
219+
dist-install-dir-$(1): PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
220+
dist-install-dir-$(1): PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
221+
dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
222+
dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
223+
dist-install-dir-$(1): PREPARE_CLEAN=true
224+
dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs
219225
$$(Q)(cd $$(PREPARE_DEST_DIR)/ && find . -type f | sed 's/^\.\///') \
220226
> tmp/dist/manifest-$(1).in
221227
$$(Q)mv tmp/dist/manifest-$(1).in $$(PREPARE_DEST_DIR)/$$(CFG_LIBDIR_RELATIVE)/rustlib/manifest.in
@@ -227,24 +233,19 @@ dist-install-dir-$(1)$(3): prepare-base-dir-$(1) docs compiler-docs
227233
$$(Q)cp -r doc $$(PREPARE_DEST_DIR)
228234
$$(Q)$$(PREPARE_BIN_CMD) $$(S)src/etc/install.sh $$(PREPARE_DEST_DIR)
229235

230-
endef
231-
232-
define DEF_INSTALLER
233-
234-
$$(eval $$(call DEF_PREPARE,dir-$(1)))
235-
236-
$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(1),))
237-
238-
$$(eval $$(call DEF_PREPARE_DIST_DIR,$(1),$(CFG_TARGET),-with-target-libs))
239-
240236
dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1)
241237
@$(call E, build: $$@)
242238
$$(Q)tar -czf dist/$$(PKG_NAME)-$(1).tar.gz -C tmp/dist $$(PKG_NAME)-$(1)
243239

244240
endef
245241

242+
ifneq ($(CFG_ENABLE_DIST_HOST_ONLY),)
243+
$(foreach host,$(CFG_HOST),\
244+
$(eval $(call DEF_INSTALLER,$(host),$(host))))
245+
else
246246
$(foreach host,$(CFG_HOST),\
247-
$(eval $(call DEF_INSTALLER,$(host))))
247+
$(eval $(call DEF_INSTALLER,$(host),$(CFG_TARGET))))
248+
endif
248249

249250
dist-install-dirs: $(foreach host,$(CFG_HOST),dist-install-dir-$(host))
250251

@@ -259,7 +260,6 @@ distcheck-tar-bins: dist-tar-bins
259260
$(Q)cd tmp/distcheck && tar -xzf ../../dist/$(PKG_NAME)-$(CFG_BUILD).tar.gz
260261
$(Q)mkdir -p tmp/distcheck/tarbininstall
261262
$(Q)sh tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix=tmp/distcheck/tarbininstall
262-
$(Q)tmp/distcheck/tarbininstall/bin/rustc --version
263263
$(Q)sh tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix=tmp/distcheck/tarbininstall --uninstall
264264
$(Q)rm -Rf tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD)
265265
$(Q)rm -Rf tmp/distcheck/tarbininstall

0 commit comments

Comments
 (0)