Skip to content

Commit 819d068

Browse files
ManishearthManishearth
committed
---
yaml --- r: 274871 b: refs/heads/stable c: 1c5c2f5 h: refs/heads/master i: 274869: ebb5da7 274867: 2ff6c02 274863: 1c78e66
1 parent 936131a commit 819d068

File tree

414 files changed

+11624
-6033
lines changed

Some content is hidden

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

414 files changed

+11624
-6033
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: cff81d724fa73003fe7e589a9433db33dde742a6
32+
refs/heads/stable: 1c5c2f548e419191f499f78efdc49840dba6508e
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,4 @@ tmp.*.rs
9393
version.md
9494
version.ml
9595
version.texi
96+
/target

‎branches/stable/configure

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,7 @@ opt stage0-landing-pads 1 "enable landing pads during bootstrap with stage0"
606606
opt dist-host-only 0 "only install bins for the host architecture"
607607
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
608608
opt llvm-version-check 1 "check if the LLVM version is supported, build anyway"
609+
opt rustbuild 0 "use the rust and cargo based build system"
609610

610611
# Optimization and debugging options. These may be overridden by the release channel, etc.
611612
opt_nosave optimize 1 "build optimized rust code"
@@ -625,7 +626,7 @@ valopt llvm-root "" "set LLVM root"
625626
valopt python "" "set path to python"
626627
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
627628
valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
628-
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path (deprecated)"
629+
valopt android-cross-path "" "Android NDK standalone path (deprecated)"
629630
valopt i686-linux-android-ndk "" "i686-linux-android NDK standalone path"
630631
valopt arm-linux-androideabi-ndk "" "arm-linux-androideabi NDK standalone path"
631632
valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
@@ -1422,7 +1423,7 @@ done
14221423
step_msg "configuring submodules"
14231424

14241425
# Have to be in the top of src directory for this
1425-
if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ]
1426+
if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ] && [ -z $CFG_ENABLE_RUSTBUILD ]
14261427
then
14271428
cd ${CFG_SRC_DIR}
14281429

@@ -1481,7 +1482,11 @@ do
14811482
;;
14821483
esac
14831484

1484-
if [ -z $CFG_LLVM_ROOT ]
1485+
if [ -n "$CFG_ENABLE_RUSTBUILD" ]
1486+
then
1487+
msg "not configuring LLVM, rustbuild in use"
1488+
do_reconfigure=0
1489+
elif [ -z $CFG_LLVM_ROOT ]
14851490
then
14861491
LLVM_BUILD_DIR=${CFG_BUILD_DIR}$t/llvm
14871492
if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]
@@ -1812,8 +1817,15 @@ do
18121817
putvar $CFG_LLVM_INST_DIR
18131818
done
18141819

1820+
if [ -n "$CFG_ENABLE_RUSTBUILD" ]
1821+
then
1822+
INPUT_MAKEFILE=src/bootstrap/mk/Makefile.in
1823+
else
1824+
INPUT_MAKEFILE=Makefile.in
1825+
fi
1826+
18151827
msg
1816-
copy_if_changed ${CFG_SRC_DIR}Makefile.in ./Makefile
1828+
copy_if_changed ${CFG_SRC_DIR}${INPUT_MAKEFILE} ./Makefile
18171829
move_if_changed config.tmp config.mk
18181830
rm -f config.tmp
18191831
touch config.stamp

‎branches/stable/mk/crates.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ TARGET_CRATES += alloc_jemalloc
144144
DEPS_std += alloc_jemalloc
145145
DEPS_alloc_jemalloc := core libc native:jemalloc
146146
ONLY_RLIB_alloc_jemalloc := 1
147-
else
148-
RUSTFLAGS_rustc_back := --cfg disable_jemalloc
147+
RUSTFLAGS_rustc_back := --cfg 'feature="jemalloc"'
149148
endif
150149

151150
################################################################################

‎branches/stable/mk/docs.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ RUSTBOOK = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(RUSTBOOK_EXE)
6262
# The error-index-generator executable...
6363
ERR_IDX_GEN_EXE = $(HBIN2_H_$(CFG_BUILD))/error-index-generator$(X_$(CFG_BUILD))
6464
ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
65+
ERR_IDX_GEN_MD = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE) markdown
6566

6667
D := $(S)src/doc
6768

@@ -217,6 +218,12 @@ doc/style/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/style/*.md) | doc/
217218

218219
error-index: doc/error-index.html
219220

220-
doc/error-index.html: $(ERR_IDX_GEN_EXE) | doc/
221+
# Metadata used to generate the index is created as a side effect of
222+
# the build so this depends on every crate being up to date.
223+
doc/error-index.html: $(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
221224
$(Q)$(call E, error-index-generator: $@)
222225
$(Q)$(ERR_IDX_GEN)
226+
227+
doc/error-index.md: $(ERR_IDX_GEN_EXE) $(CSREQ$(2)_T_$(CFG_BUILD)_H_$(CFG_BUILD)) | doc/
228+
$(Q)$(call E, error-index-generator: $@)
229+
$(Q)$(ERR_IDX_GEN_MD)

‎branches/stable/mk/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ $(foreach host,$(CFG_HOST), \
102102
define LLVM_LINKAGE_DEPS
103103
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.rustc_llvm: $$(LLVM_LINKAGE_PATH_$(2))
104104
RUSTFLAGS$(1)_rustc_llvm_T_$(2) += $$(shell echo $$(LLVM_ALL_COMPONENTS_$(2)) | tr '-' '_' |\
105-
sed -e 's/^ //;s/\([^ ]*\)/\-\-cfg have_component_\1/g')
105+
sed -e 's/^ //;s/\([^ ]*\)/\-\-cfg "llvm_component=\\"\1\\""/g')
106106
endef
107107

108108
$(foreach source,$(CFG_HOST), \

‎branches/stable/mk/tests.mk

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,14 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
298298
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
299299
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
300300
check-stage$(1)-T-$(2)-H-$(3)-pfail-exec \
301-
check-stage$(1)-T-$(2)-H-$(3)-rpass-valgrind-exec \
302-
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
303-
check-stage$(1)-T-$(2)-H-$(3)-rfail-full-exec \
301+
check-stage$(1)-T-$(2)-H-$(3)-rpass-valgrind-exec \
302+
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
303+
check-stage$(1)-T-$(2)-H-$(3)-rfail-full-exec \
304304
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
305305
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
306306
check-stage$(1)-T-$(2)-H-$(3)-rustdocck-exec \
307-
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
308-
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
307+
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
308+
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
309309
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-gdb-exec \
310310
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-lldb-exec \
311311
check-stage$(1)-T-$(2)-H-$(3)-codegen-exec \
@@ -673,8 +673,8 @@ CTEST_DEPS_debuginfo-lldb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_LLDB_TESTS) \
673673
CTEST_DEPS_codegen_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_TESTS)
674674
CTEST_DEPS_codegen-units_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_UNITS_TESTS)
675675
CTEST_DEPS_rustdocck_$(1)-T-$(2)-H-$(3) = $$(RUSTDOCCK_TESTS) \
676-
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
677-
$(S)src/etc/htmldocck.py
676+
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
677+
$(S)src/etc/htmldocck.py
678678

679679
endef
680680

@@ -892,6 +892,28 @@ $(foreach host,$(CFG_HOST), \
892892
$(foreach crate,$(TEST_DOC_CRATES), \
893893
$(eval $(call DEF_CRATE_DOC_TEST,$(stage),$(target),$(host),$(crate)))))))
894894

895+
define DEF_DOC_TEST_ERROR_INDEX
896+
897+
check-stage$(1)-T-$(2)-H-$(3)-doc-error-index-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-error-index)
898+
899+
ifeq ($(2),$$(CFG_BUILD))
900+
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-error-index): \
901+
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
902+
doc/error-index.md
903+
$$(Q)touch $$@.start_time
904+
$$(RUSTDOC_$(1)_T_$(2)_H_$(3)) --test doc/error-index.md
905+
$$(Q)touch -r $$@.start_time $$@ && rm $$@.start_time
906+
else
907+
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-error-index):
908+
$$(Q)touch $$@
909+
endif
910+
endef
911+
912+
$(foreach host,$(CFG_HOST), \
913+
$(foreach target,$(CFG_TARGET), \
914+
$(foreach stage,$(STAGES), \
915+
$(eval $(call DEF_DOC_TEST_ERROR_INDEX,$(stage),$(target),$(host))))))
916+
895917
######################################################################
896918
# Shortcut rules
897919
######################################################################
@@ -901,7 +923,7 @@ TEST_GROUPS = \
901923
$(foreach crate,$(TEST_CRATES),$(crate)) \
902924
$(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
903925
rpass \
904-
rpass-valgrind \
926+
rpass-valgrind \
905927
rpass-full \
906928
rfail-full \
907929
cfail-full \
@@ -918,7 +940,7 @@ TEST_GROUPS = \
918940
$(foreach docname,$(DOC_NAMES),doc-$(docname)) \
919941
pretty \
920942
pretty-rpass \
921-
pretty-rpass-valgrind \
943+
pretty-rpass-valgrind \
922944
pretty-rpass-full \
923945
pretty-rfail-full \
924946
pretty-rfail \
@@ -987,7 +1009,8 @@ define DEF_CHECK_DOC_FOR_STAGE
9871009
check-stage$(1)-docs: $$(foreach docname,$$(DOC_NAMES), \
9881010
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-$$(docname)) \
9891011
$$(foreach crate,$$(TEST_DOC_CRATES), \
990-
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-crate-$$(crate))
1012+
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-crate-$$(crate)) \
1013+
check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-error-index-exec
9911014
endef
9921015

9931016
$(foreach stage,$(STAGES), \

‎branches/stable/src/bootstrap/Cargo.lock

Lines changed: 109 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎branches/stable/src/bootstrap/Cargo.toml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "bootstrap"
4+
version = "0.0.0"
5+
6+
[lib]
7+
name = "bootstrap"
8+
path = "lib.rs"
9+
10+
[[bin]]
11+
name = "bootstrap"
12+
path = "main.rs"
13+
14+
[[bin]]
15+
name = "rustc"
16+
path = "rustc.rs"
17+
18+
[dependencies]
19+
build_helper = { path = "../build_helper" }
20+
cmake = "0.1.10"
21+
filetime = "0.1"
22+
num_cpus = "0.2"
23+
toml = "0.1"
24+
getopts = "0.2"
25+
rustc-serialize = "0.3"
26+
winapi = "0.2"
27+
kernel32-sys = "0.2"
28+
gcc = "0.3.17"
29+
libc = "0.2"

0 commit comments

Comments
 (0)