Skip to content

Commit 0ea868e

Browse files
borsbors
committed
---
yaml --- r: 64073 b: refs/heads/snap-stage3 c: 005c9bd h: refs/heads/master i: 64071: f422877 v: v3
1 parent dd5ffe4 commit 0ea868e

Some content is hidden

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

75 files changed

+897
-972
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: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 033ac5497e00d2380b6cb816498a945fbc10c1e6
4+
refs/heads/snap-stage3: 005c9bde45ba53b9039765a9ed549707973c15c4
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/Makefile.in

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -235,33 +235,6 @@ LIBRUST_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rust)
235235

236236
endef
237237

238-
# $(1) is the path for directory to match against
239-
# $(2) is the glob to use in the match
240-
# $(3) is filename (usually the target being created) to filter out from match
241-
# (i.e. filename is not out-of-date artifact from prior Rust version/build)
242-
# The glob denoted by $(2) often is constructed with a space character prefix,
243-
# which is why we cannot just do `ls` on $(1)/$(2).
244-
define CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT
245-
$(Q)( cd $(1) && ( ls $(2) 2>/dev/null || true ) | grep -v $(3) > /dev/null && echo "Warning: there are previous" '$(2)' "libraries:" || true )
246-
$(Q)( cd $(1) && ( ls $(2) 2>/dev/null || true ) | grep -v $(3) || true )
247-
endef
248-
249-
# Same interface as above, but deletes rather than just listing the files.
250-
define REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT
251-
$(Q)( cd $(1) && ( ls $(2) 2>/dev/null || true ) | grep -v $(3) > /dev/null && echo "Warning: removing previous" '$(2)' "libraries:" || true )
252-
$(Q)( cd $(1) && ( ls $(2) 2>/dev/null || true ) | grep -v $(3) | xargs rm -v )
253-
endef
254-
255-
ifdef VERBOSE
256-
define LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
257-
@echo "Info: now are following matches for" '$(2)' "libraries:"
258-
@( cd $(1) && ( ls $(2) 2>/dev/null || true ) | grep -v $(3) || true )
259-
endef
260-
else
261-
define LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
262-
endef
263-
endif
264-
265238
$(foreach target,$(CFG_TARGET_TRIPLES),\
266239
$(eval $(call DEF_LIBS,$(target))))
267240

‎branches/snap-stage3/mk/host.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
4545
| $$(HLIB$(2)_H_$(4))/
4646

4747
@$$(call E, cp: $$@)
48-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBRUSTC_GLOB_$(4)), `basename $$@`)
4948
$$(Q)cp $$< $$@
5049
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB_$(4)) \
5150
$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB_$(4))) \
5251
$$(HLIB$(2)_H_$(4))
53-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBRUSTC_GLOB_$(4)), `basename $$@`)
5452

5553
$$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
5654
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBSYNTAX_$(4)) \
@@ -60,12 +58,10 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
6058
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
6159
| $$(HLIB$(2)_H_$(4))/
6260
@$$(call E, cp: $$@)
63-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBSYNTAX_GLOB_$(4)), `basename $$@`)
6461
$$(Q)cp $$< $$@
6562
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB_$(4)) \
6663
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB_$(4))) \
6764
$$(HLIB$(2)_H_$(4))
68-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBSYNTAX_GLOB_$(4)), `basename $$@`)
6965

7066
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)): \
7167
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUNTIME_$(4)) \
@@ -78,7 +74,6 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
7874
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
7975
| $$(HLIB$(2)_H_$(4))/
8076
@$$(call E, cp: $$@)
81-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(STDLIB_GLOB_$(4)), `basename $$@`)
8277
$$(Q)cp $$< $$@
8378
# Subtle: We do not let the shell expand $(STDLIB_DSYM_GLOB) directly rather
8479
# we use Make's $$(wildcard) facility. The reason is that, on mac, when using
@@ -90,20 +85,17 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
9085
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB_$(4)) \
9186
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB_$(4))) \
9287
$$(HLIB$(2)_H_$(4))
93-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(STDLIB_GLOB_$(4)), `basename $$@`)
9488

9589
$$(HLIB$(2)_H_$(4))/$(CFG_EXTRALIB_$(4)): \
9690
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
9791
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)) \
9892
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
9993
| $$(HLIB$(2)_H_$(4))/
10094
@$$(call E, cp: $$@)
101-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(EXTRALIB_GLOB_$(4)), `basename $$@`)
10295
$$(Q)cp $$< $$@
10396
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(EXTRALIB_GLOB_$(4)) \
10497
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(EXTRALIB_DSYM_GLOB_$(4))) \
10598
$$(HLIB$(2)_H_$(4))
106-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(EXTRALIB_GLOB_$(4)), `basename $$@`)
10799

108100
$$(HLIB$(2)_H_$(4))/libstd.rlib: \
109101
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \

‎branches/snap-stage3/mk/install.mk

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,13 @@
1616
# destination directory as arg 2, and filename/libname-glob as arg 3
1717
ifdef VERBOSE
1818
INSTALL = install -m755 $(1)/$(3) $(2)/$(3)
19-
DO_INSTALL_LIB = install -m644 `ls -drt1 $(1)/$(3) | tail -1` $(2)/
19+
INSTALL_LIB = install -m644 `ls -drt1 $(1)/$(3) | tail -1` $(2)/
2020
else
2121
INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
22-
DO_INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) && \
22+
INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) && \
2323
install -m644 `ls -drt1 $(1)/$(3) | tail -1` $(2)/
2424
endif
2525

26-
# $(1) is the source dirctory
27-
# $(2) is the destination directory
28-
# $(3) is the filename/libname-glob
29-
define INSTALL_LIB
30-
LIB_NAME=`ls -drt1 $(1)/$(3) | tail -1 | xargs basename` ; ( ls -drt1 $(2)/$(3) 2>/dev/null || true ) | grep -v $$LIB_NAME >/dev/null 2>&1 && echo "Warning, one or more libraries matching Rust library '$(3)'" && echo " (other than '$$LIB_NAME' itself) already present" && echo " at destination $(2):" && ( ls -drt1 $(2)/$(3) 2>/dev/null || true ) | grep -v $$LIB_NAME || true
31-
$(call DO_INSTALL_LIB,$(1),$(2),$(3))
32-
endef
33-
3426
# The stage we install from
3527
ISTAGE = 2
3628

‎branches/snap-stage3/mk/stage0.mk

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
# Extract the snapshot host compiler
22

3-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/:
4-
mkdir -p $@
53

6-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/:
7-
mkdir -p $@
84

95
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)): \
106
$(S)src/snapshots.txt \
11-
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
12-
| $(HBIN0_H_$(CFG_BUILD_TRIPLE))/
13-
7+
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS)
148
@$(call E, fetch: $@)
159
# Note: the variable "SNAPSHOT_FILE" is generally not set, and so
1610
# we generally only pass one argument to this script.
@@ -28,28 +22,23 @@ endif
2822
# Host libs will be extracted by the above rule
2923

3024
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE)): \
31-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
32-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
25+
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))
3326
$(Q)touch $@
3427

3528
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_STDLIB_$(CFG_BUILD_TRIPLE)): \
36-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
37-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
29+
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))
3830
$(Q)touch $@
3931

4032
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_EXTRALIB_$(CFG_BUILD_TRIPLE)): \
41-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
42-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
33+
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))
4334
$(Q)touch $@
4435

4536
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE)): \
46-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
47-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
37+
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))
4838
$(Q)touch $@
4939

5040
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE)): \
51-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
52-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
41+
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE))
5342
$(Q)touch $@
5443

5544
# For other targets, let the host build the target:
@@ -59,51 +48,33 @@ define BOOTSTRAP_STAGE0
5948
# $(2) stage to bootstrap from
6049
# $(3) target to bootstrap from
6150

62-
$(HBIN0_H_$(1))/:
63-
mkdir -p $@
64-
65-
$(HLIB0_H_$(1))/:
66-
mkdir -p $@
67-
68-
$$(HBIN0_H_$(1))/rustc$$(X_$(1)): \
69-
$$(TBIN$(2)_T_$(1)_H_$(3))/rustc$$(X_$(1)) \
70-
| $(HBIN0_H_$(1))/
51+
$$(HBIN0_H_$(1))/rustc$$(X_$(1)): \
52+
$$(TBIN$(2)_T_$(1)_H_$(3))/rustc$$(X_$(1))
7153
@$$(call E, cp: $$@)
7254
$$(Q)cp $$< $$@
7355

7456
$$(HLIB0_H_$(1))/$(CFG_RUNTIME_$(1)): \
75-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_RUNTIME_$(1)) \
76-
| $(HLIB0_H_$(1))/
57+
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_RUNTIME_$(1))
7758
@$$(call E, cp: $$@)
7859
$$(Q)cp $$< $$@
7960

8061
$$(HLIB0_H_$(1))/$(CFG_STDLIB_$(1)): \
81-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_STDLIB_$(1)) \
82-
| $(HLIB0_H_$(1))/
62+
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_STDLIB_$(1))
8363
@$$(call E, cp: $$@)
84-
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(EXTRALIB_GLOB_$(4)), `basename $$@`)
8564
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(STDLIB_GLOB_$(1)) $$@
86-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(EXTRALIB_GLOB_$(4)), `basename $$@`)
8765

8866
$$(HLIB0_H_$(1))/$(CFG_EXTRALIB_$(1)): \
89-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_EXTRALIB_$(1)) \
90-
| $(HLIB0_H_$(1))/
67+
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_EXTRALIB_$(1))
9168
@$$(call E, cp: $$@)
92-
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(EXTRALIB_GLOB_$(4)), `basename $$@`)
9369
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(EXTRALIB_GLOB_$(1)) $$@
94-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(EXTRALIB_GLOB_$(4)), `basename $$@`)
9570

9671
$$(HLIB0_H_$(1))/$(CFG_LIBRUSTC_$(1)): \
97-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_LIBRUSTC_$(1)) \
98-
| $(HLIB0_H_$(1))/
72+
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_LIBRUSTC_$(1))
9973
@$$(call E, cp: $$@)
100-
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBRUSTC_GLOB_$(4)), `basename $$@`)
10174
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(LIBRUSTC_GLOB_$(1)) $$@
102-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBRUSTC_GLOB_$(4)), `basename $$@`)
10375

10476
$$(HLIB0_H_$(1))/$(CFG_RUSTLLVM_$(1)): \
105-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_RUSTLLVM_$(1)) \
106-
| $(HLIB0_H_$(1))/
77+
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_RUSTLLVM_$(1))
10778
@$$(call E, cp: $$@)
10879
$$(Q)cp $$< $$@
10980

‎branches/snap-stage3/mk/target.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,15 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)): \
4848
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
4949
| $$(TLIB$(1)_T_$(2)_H_$(3))/
5050
@$$(call E, compile_and_link: $$@)
51-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(STDLIB_GLOB_$(2)), `basename $$@`)
5251
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) -o $$@ $$< && touch $$@
53-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(STDLIB_GLOB_$(2)), `basename $$@`)
5452

5553
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)): \
5654
$$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \
5755
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
5856
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
5957
| $$(TLIB$(1)_T_$(2)_H_$(3))/
6058
@$$(call E, compile_and_link: $$@)
61-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(EXTRALIB_GLOB_$(2)), `basename $$@`)
6259
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) -o $$@ $$< && touch $$@
63-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(EXTRALIB_GLOB_$(2)), `basename $$@`)
6460

6561
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
6662
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
@@ -69,9 +65,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
6965
$$(TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3)) \
7066
| $$(TLIB$(1)_T_$(2)_H_$(3))/
7167
@$$(call E, compile_and_link: $$@)
72-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBSYNTAX_GLOB_$(2)), `basename $$@`)
7368
$$(STAGE$(1)_T_$(2)_H_$(3)) $(BORROWCK) -o $$@ $$< && touch $$@
74-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBSYNTAX_GLOB_$(2)), `basename $$@`)
7569

7670
# Only build the compiler for host triples
7771
ifneq ($$(findstring $(2),$$(CFG_HOST_TRIPLES)),)
@@ -89,9 +83,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
8983
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
9084
| $$(TLIB$(1)_T_$(2)_H_$(3))/
9185
@$$(call E, compile_and_link: $$@)
92-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBRUSTC_GLOB_$(2)), `basename $$@`)
9386
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
94-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT, `dirname $$@`, $(LIBRUSTC_GLOB_$(2)), `basename $$@`)
9587

9688
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
9789
$$(DRIVER_CRATE) \

0 commit comments

Comments
 (0)