Skip to content

Commit 226c98c

Browse files
cardoecardoe
committed
---
yaml --- r: 277636 b: refs/heads/try c: f875dac h: refs/heads/master
1 parent fd2dbed commit 226c98c

File tree

696 files changed

+16952
-20805
lines changed

Some content is hidden

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

696 files changed

+16952
-20805
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: 6301e22e157ba676b0b2477f6670ab8f954767a8
4+
refs/heads/try: f875daca54b14d74a3b236b971b88d5e5f739b81
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try/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/try/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Read ["Installing Rust"] from [The Book].
1616

1717
1. Make sure you have installed the dependencies:
1818

19-
* `g++` 4.7 or later or `clang++` 3.x
19+
* `g++` 4.7 or `clang++` 3.x
2020
* `python` 2.7 (but not 3.x)
2121
* GNU `make` 3.81 or later
2222
* `curl`

‎branches/try/RELEASES.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ Cargo
140140
Performance
141141
-----------
142142

143-
* [The time complexity of comparing variables for equivalence during type
144-
unification is reduced from _O_(_n_!) to _O_(_n_)][1.9tu]. This leads
145-
to major compilation time improvement in some scenarios.
143+
* [During type unification, the complexity of comparing variables for
144+
equivalance was reduced from `O(n!)` to `O(n)`][1.9tu]. This leads
145+
to major compile-time improvements in some scenarios.
146146
* [`ToString` is specialized for `str`, giving it the same performance
147147
as `to_owned`][1.9ts].
148148
* [Spawning processes with `Command::output` no longer creates extra

‎branches/try/configure

Lines changed: 2 additions & 32 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
@@ -823,19 +819,6 @@ then
823819
fi
824820
fi
825821

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-
839822
step_msg "looking for target specific programs"
840823

841824
probe CFG_ADB adb
@@ -1453,19 +1436,6 @@ then
14531436
cd ${CFG_BUILD_DIR}
14541437
fi
14551438

1456-
# Do a sanity check that the submodule source exists. Because GitHub
1457-
# automatically publishes broken tarballs that can't be disabled, and
1458-
# people download them and try to use them.
1459-
if [ ! -e "${CFG_SRC_DIR}/src/liblibc" ]; then
1460-
err "some submodules are missing. Is this a broken tarball?
1461-
1462-
If you downloaded this tarball from the GitHub release pages at
1463-
https://github.com/rust-lang/rust/releases,
1464-
then please delete it and instead download the source from
1465-
https://www.rust-lang.org/downloads.html"
1466-
1467-
fi
1468-
14691439
# Configure llvm, only if necessary
14701440
step_msg "looking at LLVM"
14711441
CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/

‎branches/try/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/try/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/try/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/try/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/try/mk/debuggers.mk

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,10 @@ DEBUGGER_BIN_SCRIPTS_LLDB_ABS=\
4141

4242

4343
## ALL ##
44-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL=gdb_load_rust_pretty_printers.py \
45-
gdb_rust_pretty_printing.py \
46-
lldb_rust_formatters.py \
47-
debugger_pretty_printers_common.py
48-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS=\
49-
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL), \
50-
$(CFG_SRC_DIR)src/etc/$(script))
44+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB) \
45+
$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB)
46+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
47+
$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS)
5148
DEBUGGER_BIN_SCRIPTS_ALL=$(DEBUGGER_BIN_SCRIPTS_GDB) \
5249
$(DEBUGGER_BIN_SCRIPTS_LLDB)
5350
DEBUGGER_BIN_SCRIPTS_ALL_ABS=$(DEBUGGER_BIN_SCRIPTS_GDB_ABS) \

‎branches/try/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/try/mk/main.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ CFG_FILENAME_EXTRA=$(shell printf '%s' $(CFG_RELEASE)$(CFG_EXTRA_FILENAME) | $(C
3434
# intentionally not "secure" by any definition, this is largely just a deterrent
3535
# from users enabling unstable features on the stable compiler.
3636
CFG_BOOTSTRAP_KEY=$(CFG_FILENAME_EXTRA)
37-
CFG_BOOTSTRAP_KEY_STAGE0=$(shell grep 'rustc_key' $(S)src/stage0.txt | sed 's/rustc_key: '//)
3837

3938
ifeq ($(CFG_RELEASE_CHANNEL),stable)
4039
# This is the normal semver version string, e.g. "0.12.0", "0.12.0-nightly"
@@ -390,7 +389,7 @@ endif
390389
# This 'function' will determine which debugger scripts to copy based on a
391390
# target triple. See debuggers.mk for more information.
392391
TRIPLE_TO_DEBUGGER_SCRIPT_SETTING=\
393-
$(if $(findstring windows-msvc,$(1)),none,all)
392+
$(if $(findstring windows,$(1)),none,$(if $(findstring darwin,$(1)),lldb,gdb))
394393

395394
STAGES = 0 1 2 3
396395

‎branches/try/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/try/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/try/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/try/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/try/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

0 commit comments

Comments
 (0)