Skip to content

Commit 971a5d0

Browse files
jseyfriedjseyfried
committed
---
yaml --- r: 277877 b: refs/heads/auto c: 0ea66f3 h: refs/heads/master i: 277875: 2be125c
1 parent aff00ec commit 971a5d0

File tree

779 files changed

+16094
-22851
lines changed

Some content is hidden

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

779 files changed

+16094
-22851
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 46504e9a9d3a57a852ff57f7530de2017a7b37ba
11+
refs/heads/auto: 0ea66f35a95e3662498881398298dcc553294d5a
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

‎branches/auto/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
/stage3/
7979
/test/
8080
/tmp/
81-
/obj/
8281
TAGS
8382
TAGS.emacs
8483
TAGS.vi

‎branches/auto/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ are:
307307
[gsearchdocs]: https://www.google.com/search?q=site:doc.rust-lang.org+your+query+here
308308
[rif]: http://internals.rust-lang.org
309309
[rr]: https://doc.rust-lang.org/book/README.html
310-
[tlgba]: http://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/
310+
[tlgba]: http://tomlee.co/2014/04/03/a-more-detailed-tour-of-the-rust-compiler/
311311
[ro]: http://www.rustaceans.org/
312312
[rctd]: ./COMPILER_TESTS.md
313313
[cheatsheet]: http://buildbot.rust-lang.org/homu/

‎branches/auto/Makefile.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,13 @@ include $(CFG_SRC_DIR)mk/debuggers.mk
214214
# Secondary makefiles, conditionalized for speed
215215
######################################################################
216216

217+
# Binary snapshots
218+
ifneq ($(strip $(findstring snap,$(MAKECMDGOALS)) \
219+
$(findstring clean,$(MAKECMDGOALS))),)
220+
CFG_INFO := $(info cfg: including snap rules)
221+
include $(CFG_SRC_DIR)mk/snap.mk
222+
endif
223+
217224
# The test suite
218225
ifneq ($(strip $(findstring check,$(MAKECMDGOALS)) \
219226
$(findstring test,$(MAKECMDGOALS)) \

‎branches/auto/RELEASES.md

Lines changed: 0 additions & 496 deletions
Large diffs are not rendered by default.

‎branches/auto/configure

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@ opt llvm-version-check 1 "check if the LLVM version is supported, build anyway"
609609
opt rustbuild 0 "use the rust and cargo based build system"
610610
opt orbit 0 "get MIR where it belongs - everywhere; most importantly, in orbit"
611611
opt codegen-tests 1 "run the src/test/codegen tests"
612-
opt option-checking 1 "complain about unrecognized options in this configure script"
613612

614613
# Optimization and debugging options. These may be overridden by the release channel, etc.
615614
opt_nosave optimize 1 "build optimized rust code"
@@ -675,11 +674,8 @@ then
675674
fi
676675

677676
# Validate Options
678-
if [ -z "$CFG_DISABLE_OPTION_CHECKING" ]
679-
then
680-
step_msg "validating $CFG_SELF args"
681-
validate_opt
682-
fi
677+
step_msg "validating $CFG_SELF args"
678+
validate_opt
683679

684680
# Validate the release channel, and configure options
685681
case "$CFG_RELEASE_CHANNEL" in
@@ -721,6 +717,18 @@ if [ -n "$CFG_ENABLE_DEBUG_JEMALLOC" ]; then putvar CFG_ENABLE_DEBUG_JEMALLOC; f
721717

722718
if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_ORBIT; fi
723719

720+
# A magic value that allows the compiler to use unstable features
721+
# during the bootstrap even when doing so would normally be an error
722+
# because of feature staging or because the build turns on
723+
# warnings-as-errors and unstable features default to warnings. The
724+
# build has to match this key in an env var. Meant to be a mild
725+
# deterrent from users just turning on unstable features on the stable
726+
# channel.
727+
# Basing CFG_BOOTSTRAP_KEY on CFG_BOOTSTRAP_KEY lets it get picked up
728+
# during a Makefile reconfig.
729+
CFG_BOOTSTRAP_KEY="${CFG_BOOTSTRAP_KEY-`date +%H:%M:%S`}"
730+
putvar CFG_BOOTSTRAP_KEY
731+
724732
step_msg "looking for build programs"
725733

726734
probe_need CFG_CURLORWGET curl wget
@@ -823,19 +831,6 @@ then
823831
fi
824832
fi
825833

826-
# LLDB tests on OSX require /usr/bin/python, not something like Homebrew's
827-
# /usr/local/bin/python. We're loading a compiled module for LLDB tests which is
828-
# only compatible with the system.
829-
case $CFG_BUILD in
830-
*-apple-darwin)
831-
CFG_LLDB_PYTHON=/usr/bin/python
832-
;;
833-
*)
834-
CFG_LLDB_PYTHON=$CFG_PYTHON
835-
;;
836-
esac
837-
putvar CFG_LLDB_PYTHON
838-
839834
step_msg "looking for target specific programs"
840835

841836
probe CFG_ADB adb

‎branches/auto/mk/cfg/i586-pc-windows-msvc.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# i586-pc-windows-msvc configuration
2-
CC_i586-pc-windows-msvc=$(CFG_MSVC_CL_i386)
3-
LINK_i586-pc-windows-msvc=$(CFG_MSVC_LINK_i386)
4-
CXX_i586-pc-windows-msvc=$(CFG_MSVC_CL_i386)
5-
CPP_i586-pc-windows-msvc=$(CFG_MSVC_CL_i386)
6-
AR_i586-pc-windows-msvc=$(CFG_MSVC_LIB_i386)
2+
CC_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
3+
LINK_i586-pc-windows-msvc="$(CFG_MSVC_LINK_i386)" -nologo
4+
CXX_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
5+
CPP_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
6+
AR_i586-pc-windows-msvc="$(CFG_MSVC_LIB_i386)" -nologo
77
CFG_LIB_NAME_i586-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_i586-pc-windows-msvc=$(1).lib
99
CFG_LIB_GLOB_i586-pc-windows-msvc=$(1)-*.{dll,lib}
1010
CFG_LIB_DSYM_GLOB_i586-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_i586-pc-windows-msvc :=
12-
CFG_GCCISH_CFLAGS_i586-pc-windows-msvc := -MD -arch:IA32 -nologo
13-
CFG_GCCISH_CXXFLAGS_i586-pc-windows-msvc := -MD -arch:IA32 -nologo
12+
CFG_GCCISH_CFLAGS_i586-pc-windows-msvc := -MD -arch:IA32
13+
CFG_GCCISH_CXXFLAGS_i586-pc-windows-msvc := -MD -arch:IA32
1414
CFG_GCCISH_LINK_FLAGS_i586-pc-windows-msvc :=
1515
CFG_GCCISH_DEF_FLAG_i586-pc-windows-msvc :=
1616
CFG_LLC_FLAGS_i586-pc-windows-msvc :=

‎branches/auto/mk/cfg/i686-pc-windows-msvc.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# i686-pc-windows-msvc configuration
2-
CC_i686-pc-windows-msvc=$(CFG_MSVC_CL_i386)
3-
LINK_i686-pc-windows-msvc=$(CFG_MSVC_LINK_i386)
4-
CXX_i686-pc-windows-msvc=$(CFG_MSVC_CL_i386)
5-
CPP_i686-pc-windows-msvc=$(CFG_MSVC_CL_i386)
6-
AR_i686-pc-windows-msvc=$(CFG_MSVC_LIB_i386)
2+
CC_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
3+
LINK_i686-pc-windows-msvc="$(CFG_MSVC_LINK_i386)" -nologo
4+
CXX_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
5+
CPP_i686-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
6+
AR_i686-pc-windows-msvc="$(CFG_MSVC_LIB_i386)" -nologo
77
CFG_LIB_NAME_i686-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_i686-pc-windows-msvc=$(1).lib
99
CFG_LIB_GLOB_i686-pc-windows-msvc=$(1)-*.{dll,lib}
1010
CFG_LIB_DSYM_GLOB_i686-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_i686-pc-windows-msvc :=
12-
CFG_GCCISH_CFLAGS_i686-pc-windows-msvc := -MD -nologo
13-
CFG_GCCISH_CXXFLAGS_i686-pc-windows-msvc := -MD -nologo
12+
CFG_GCCISH_CFLAGS_i686-pc-windows-msvc := -MD
13+
CFG_GCCISH_CXXFLAGS_i686-pc-windows-msvc := -MD
1414
CFG_GCCISH_LINK_FLAGS_i686-pc-windows-msvc :=
1515
CFG_GCCISH_DEF_FLAG_i686-pc-windows-msvc :=
1616
CFG_LLC_FLAGS_i686-pc-windows-msvc :=

‎branches/auto/mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# x86_64-pc-windows-msvc configuration
2-
CC_x86_64-pc-windows-msvc=$(CFG_MSVC_CL_x86_64)
3-
LINK_x86_64-pc-windows-msvc=$(CFG_MSVC_LINK_x86_64)
4-
CXX_x86_64-pc-windows-msvc=$(CFG_MSVC_CL_x86_64)
5-
CPP_x86_64-pc-windows-msvc=$(CFG_MSVC_CL_x86_64)
6-
AR_x86_64-pc-windows-msvc=$(CFG_MSVC_LIB_x86_64)
2+
CC_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
3+
LINK_x86_64-pc-windows-msvc="$(CFG_MSVC_LINK_x86_64)" -nologo
4+
CXX_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
5+
CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL_x86_64)" -nologo
6+
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB_x86_64)" -nologo
77
CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib
99
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.{dll,lib}
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
12-
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD -nologo
13-
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc := -MD -nologo
12+
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD
13+
CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc := -MD
1414
CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-msvc :=
1515
CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-msvc :=
1616
CFG_LLC_FLAGS_x86_64-pc-windows-msvc :=

‎branches/auto/mk/crates.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ DEPS_rustc_const_eval := rustc_const_math rustc syntax log serialize \
9797
rustc_back graphviz
9898

9999
DEPS_rustc := syntax fmt_macros flate arena serialize getopts rbml \
100-
log graphviz rustc_llvm rustc_back rustc_data_structures\
100+
log graphviz rustc_back rustc_data_structures\
101101
rustc_const_math
102102
DEPS_rustc_back := std syntax flate log libc
103103
DEPS_rustc_borrowck := rustc rustc_mir log graphviz syntax
@@ -120,20 +120,20 @@ DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back rustc_mir
120120
log syntax serialize rustc_llvm rustc_platform_intrinsics \
121121
rustc_const_math rustc_const_eval rustc_incremental
122122
DEPS_rustc_incremental := rbml rustc serialize rustc_data_structures
123-
DEPS_rustc_save_analysis := rustc log syntax serialize
123+
DEPS_rustc_save_analysis := rustc log syntax
124124
DEPS_rustc_typeck := rustc syntax rustc_platform_intrinsics rustc_const_math \
125125
rustc_const_eval
126126

127127
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
128128
test rustc_lint rustc_const_eval
129129

130130

131-
TOOL_DEPS_compiletest := test getopts log serialize
131+
TOOL_DEPS_compiletest := test getopts log
132132
TOOL_DEPS_rustdoc := rustdoc
133133
TOOL_DEPS_rustc := rustc_driver
134134
TOOL_DEPS_rustbook := std rustdoc
135135
TOOL_DEPS_error_index_generator := rustdoc syntax serialize
136-
TOOL_SOURCE_compiletest := $(S)src/tools/compiletest/src/main.rs
136+
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
137137
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
138138
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
139139
TOOL_SOURCE_rustbook := $(S)src/tools/rustbook/main.rs

‎branches/auto/mk/dist.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ PKG_FILES := \
5050
$(addprefix $(S)src/, \
5151
bootstrap \
5252
build_helper \
53+
compiletest \
5354
doc \
5455
driver \
5556
etc \
@@ -61,7 +62,7 @@ PKG_FILES := \
6162
rtstartup \
6263
rustllvm \
6364
rustc \
64-
stage0.txt \
65+
snapshots.txt \
6566
rust-installer \
6667
tools \
6768
test) \

‎branches/auto/mk/main.mk

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
######################################################################
1414

1515
# The version number
16-
CFG_RELEASE_NUM=1.10.0
16+
CFG_RELEASE_NUM=1.9.0
1717

1818
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
1919
# NB Make sure it starts with a dot to conform to semver pre-release
@@ -24,18 +24,6 @@ CFG_PRERELEASE_VERSION=.1
2424
# versions in the same place
2525
CFG_FILENAME_EXTRA=$(shell printf '%s' $(CFG_RELEASE)$(CFG_EXTRA_FILENAME) | $(CFG_HASH_COMMAND))
2626

27-
# A magic value that allows the compiler to use unstable features during the
28-
# bootstrap even when doing so would normally be an error because of feature
29-
# staging or because the build turns on warnings-as-errors and unstable features
30-
# default to warnings. The build has to match this key in an env var.
31-
#
32-
# This value is keyed off the release to ensure that all compilers for one
33-
# particular release have the same bootstrap key. Note that this is
34-
# intentionally not "secure" by any definition, this is largely just a deterrent
35-
# from users enabling unstable features on the stable compiler.
36-
CFG_BOOTSTRAP_KEY=$(CFG_FILENAME_EXTRA)
37-
CFG_BOOTSTRAP_KEY_STAGE0=$(shell grep 'rustc_key' $(S)src/stage0.txt | sed 's/rustc_key: '//)
38-
3927
ifeq ($(CFG_RELEASE_CHANNEL),stable)
4028
# This is the normal semver version string, e.g. "0.12.0", "0.12.0-nightly"
4129
CFG_RELEASE=$(CFG_RELEASE_NUM)

‎branches/auto/mk/platform.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ define CC_MACROS
148148
CFG_CC_INCLUDE_$(1)=-I $$(1)
149149
ifeq ($$(findstring msvc,$(1)),msvc)
150150
CFG_CC_OUTPUT_$(1)=-Fo:$$(1)
151-
CFG_CREATE_ARCHIVE_$(1)='$$(AR_$(1))' -OUT:$$(1)
151+
CFG_CREATE_ARCHIVE_$(1)=$$(AR_$(1)) -OUT:$$(1)
152152
else
153153
CFG_CC_OUTPUT_$(1)=-o $$(1)
154154
CFG_CREATE_ARCHIVE_$(1)=$$(AR_$(1)) crus $$(1)
@@ -187,7 +187,7 @@ define CFG_MAKE_TOOLCHAIN
187187
endif
188188
endif
189189

190-
CFG_COMPILE_C_$(1) = '$$(CC_$(1))' \
190+
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
191191
$$(CFLAGS) \
192192
$$(CFG_GCCISH_CFLAGS) \
193193
$$(CFG_GCCISH_CFLAGS_$(1)) \
@@ -198,7 +198,7 @@ define CFG_MAKE_TOOLCHAIN
198198
$$(CFG_GCCISH_LINK_FLAGS_$(1)) \
199199
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
200200
$$(call CFG_INSTALL_NAME_$(1),$$(4))
201-
CFG_COMPILE_CXX_$(1) = '$$(CXX_$(1))' \
201+
CFG_COMPILE_CXX_$(1) = $$(CXX_$(1)) \
202202
$$(CXXFLAGS) \
203203
$$(CFG_GCCISH_CFLAGS) \
204204
$$(CFG_GCCISH_CXXFLAGS) \

‎branches/auto/mk/reconfig.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ else
3838
SREL_ROOT := $(SREL)
3939
endif
4040

41-
config.stamp: $(S)configure $(S)Makefile.in $(S)src/stage0.txt
41+
config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
4242
@$(call E, cfg: reconfiguring)
4343
$(SREL_ROOT)configure $(CFG_CONFIGURE_ARGS)

‎branches/auto/mk/rustllvm.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ $$(RT_OUTPUT_DIR_$(1))/$$(call CFG_STATIC_LIB_NAME_$(1),rustllvm): \
4343
@$$(call E, link: $$@)
4444
$$(Q)$$(call CFG_CREATE_ARCHIVE_$(1),$$@) $$^
4545

46-
RUSTLLVM_COMPONENTS_$(1) = $$(shell echo $$(LLVM_ALL_COMPONENTS_$(1)) |\
47-
tr 'a-z-' 'A-Z_'| sed -e 's/^ //;s/\([^ ]*\)/\-DLLVM_COMPONENT_\1/g')
48-
4946
# On MSVC we need to double-escape arguments that llvm-config printed which
5047
# start with a '/'. The shell we're running in will auto-translate the argument
5148
# `/foo` to `C:/msys64/foo` but we really want it to be passed through as `/foo`
@@ -54,7 +51,6 @@ $(1)/rustllvm/%.o: $(S)src/rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
5451
@$$(call E, compile: $$@)
5552
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@,) \
5653
$$(subst /,//,$$(LLVM_CXXFLAGS_$(1))) \
57-
$$(RUSTLLVM_COMPONENTS_$(1)) \
5854
$$(EXTRA_RUSTLLVM_CXXFLAGS_$(1)) \
5955
$$(RUSTLLVM_INCS_$(1)) \
6056
$$<

‎branches/auto/mk/snap.mk

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Copyright 2012 The Rust Project Developers. See the COPYRIGHT
2+
# file at the top-level directory of this distribution and at
3+
# http://rust-lang.org/COPYRIGHT.
4+
#
5+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
# option. This file may not be copied, modified, or distributed
9+
# except according to those terms.
10+
11+
define DEF_SNAP_FOR_STAGE_H
12+
# $(1) stage
13+
# $(2) triple
14+
15+
snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
16+
$(CFG_PYTHON) $(S)src/etc/make-snapshot.py stage$(1) $(2)
17+
18+
endef
19+
20+
$(foreach host,$(CFG_HOST), \
21+
$(foreach stage,1 2 3, \
22+
$(eval $(call DEF_SNAP_FOR_STAGE_H,$(stage),$(host)))))
23+
24+
snap-stage1: snap-stage1-H-$(CFG_BUILD)
25+
26+
snap-stage2: snap-stage2-H-$(CFG_BUILD)
27+
28+
snap-stage3: snap-stage3-H-$(CFG_BUILD)

‎branches/auto/mk/stage0.mk

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ $(HLIB0_H_$(CFG_BUILD))/:
1010
endif
1111

1212
$(SNAPSHOT_RUSTC_POST_CLEANUP): \
13-
$(S)src/stage0.txt \
14-
$(S)src/etc/get-stage0.py $(MKFILE_DEPS) \
13+
$(S)src/snapshots.txt \
14+
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
1515
| $(HBIN0_H_$(CFG_BUILD))/
16+
1617
@$(call E, fetch: $@)
18+
# Note: the variable "SNAPSHOT_FILE" is generally not set, and so
19+
# we generally only pass one argument to this script.
1720
ifdef CFG_ENABLE_LOCAL_RUST
1821
$(Q)$(S)src/etc/local_stage0.sh $(CFG_BUILD) $(CFG_LOCAL_RUST_ROOT) rustlib
1922
else
20-
$(Q)$(CFG_PYTHON) $(S)src/etc/get-stage0.py $(CFG_BUILD)
23+
$(Q)$(CFG_PYTHON) $(S)src/etc/get-snapshot.py $(CFG_BUILD) $(SNAPSHOT_FILE)
2124
endif
2225
$(Q)if [ -e "$@" ]; then touch "$@"; else echo "ERROR: snapshot $@ not found"; exit 1; fi
2326

‎branches/auto/mk/target.mk

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ $(foreach host,$(CFG_HOST), \
6565
# $(4) is the crate name
6666
define RUST_TARGET_STAGE_N
6767

68-
ifeq ($(1),0)
69-
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
70-
export RUSTC_BOOTSTRAP_KEY := $$(CFG_BOOTSTRAP_KEY_STAGE0)
71-
endif
72-
7368
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2)
7469
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
7570
$$(CRATEFILE_$(4)) \
@@ -118,11 +113,6 @@ endef
118113
# $(4) - name of the tool being built
119114
define TARGET_TOOL
120115

121-
ifeq ($(1),0)
122-
$$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
123-
export RUSTC_BOOTSTRAP_KEY := $$(CFG_BOOTSTRAP_KEY_STAGE0)
124-
endif
125-
126116
$$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
127117
$$(TOOL_SOURCE_$(4)) \
128118
$$(TOOL_INPUTS_$(4)) \
@@ -177,15 +167,11 @@ SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD))
177167

178168
define TARGET_HOST_RULES
179169

180-
$$(TLIB$(1)_T_$(2)_H_$(3))/: $$(SNAPSHOT_RUSTC_POST_CLEANUP)
181-
mkdir -p $$@
182-
183-
$$(TBIN$(1)_T_$(2)_H_$(3))/: $$(SNAPSHOT_RUSTC_POST_CLEANUP)
170+
$$(TLIB$(1)_T_$(2)_H_$(3))/:
184171
mkdir -p $$@
185172

186173
$$(TLIB$(1)_T_$(2)_H_$(3))/%: $$(RT_OUTPUT_DIR_$(2))/% \
187-
$$(SNAPSHOT_RUSTC_POST_CLEANUP) \
188-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
174+
| $$(TLIB$(1)_T_$(2)_H_$(3))/ $$(SNAPSHOT_RUSTC_POST_CLEANUP)
189175
@$$(call E, cp: $$@)
190176
$$(Q)cp $$< $$@
191177
endef

0 commit comments

Comments
 (0)