Skip to content

Commit 04c8efa

Browse files
erickterickt
committed
---
yaml --- r: 94771 b: refs/heads/try c: daf4fa7 h: refs/heads/master i: 94769: a4eceaf 94767: e8c11ba v: v3
1 parent 55a0c09 commit 04c8efa

File tree

245 files changed

+10479
-11902
lines changed

Some content is hidden

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

245 files changed

+10479
-11902
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
5-
refs/heads/try: 1a9c8cc1283675dfc1b85dbf80a9ea07a2b8b335
5+
refs/heads/try: daf4fa720c7e4ab8ba5e877fbf34ae677b844343
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/Makefile.in

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,6 @@ CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
235235
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
236236
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
237237
CFG_LIBRUSTUV_$(1) :=$(call CFG_LIB_NAME_$(1),rustuv)
238-
CFG_LIBGREEN_$(1) :=$(call CFG_LIB_NAME_$(1),green)
239-
CFG_LIBNATIVE_$(1) :=$(call CFG_LIB_NAME_$(1),native)
240238

241239
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
242240
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
@@ -245,25 +243,19 @@ LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
245243
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
246244
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
247245
LIBRUSTUV_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustuv)
248-
LIBGREEN_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),green)
249-
LIBNATIVE_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),native)
250246
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
251247
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
252248
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
253249
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
254250
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
255251
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
256252
LIBRUSTUV_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustuv)
257-
LIBGREEN_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),green)
258-
LIBNATIVE_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),native)
259253

260254
EXTRALIB_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,extra)
261255
STDLIB_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,std)
262256
LIBRUSTUV_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,rustuv)
263257
LIBSYNTAX_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,syntax)
264258
LIBRUSTC_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,rustc)
265-
LIBNATIVE_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,native)
266-
LIBGREEN_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,green)
267259

268260
endef
269261

@@ -280,15 +272,9 @@ define CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT
280272
endef
281273

282274
# Same interface as above, but deletes rather than just listing the files.
283-
ifdef VERBOSE
284275
define REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT
285276
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then echo "warning: removing previous" \'$(2)\' "libraries:" $$MATCHES; rm $$MATCHES ; fi
286277
endef
287-
else
288-
define REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT
289-
$(Q)MATCHES="$(filter-out %$(3),$(wildcard $(1)/$(2)))"; if [ -n "$$MATCHES" ] ; then rm $$MATCHES ; fi
290-
endef
291-
endif
292278

293279
# We use a different strategy for LIST_ALL_OLD_GLOB_MATCHES_EXCEPT
294280
# than in the macros above because it needs the result of running the
@@ -333,22 +319,6 @@ LIBRUSTUV_CRATE := $(S)src/librustuv/lib.rs
333319
LIBRUSTUV_INPUTS := $(wildcard $(addprefix $(S)src/librustuv/, \
334320
*.rs */*.rs))
335321

336-
######################################################################
337-
# Green threading library variables
338-
######################################################################
339-
340-
LIBGREEN_CRATE := $(S)src/libgreen/lib.rs
341-
LIBGREEN_INPUTS := $(wildcard $(addprefix $(S)src/libgreen/, \
342-
*.rs */*.rs))
343-
344-
######################################################################
345-
# Native threading library variables
346-
######################################################################
347-
348-
LIBNATIVE_CRATE := $(S)src/libnative/lib.rs
349-
LIBNATIVE_INPUTS := $(wildcard $(addprefix $(S)src/libnative/, \
350-
*.rs */*.rs))
351-
352322
######################################################################
353323
# rustc crate variables
354324
######################################################################
@@ -460,16 +430,6 @@ HLIBRUSTUV_DEFAULT$(1)_H_$(3) = \
460430
TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3) = \
461431
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
462432

463-
HLIBGREEN_DEFAULT$(1)_H_$(3) = \
464-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBGREEN_$(3))
465-
TLIBGREEN_DEFAULT$(1)_T_$(2)_H_$(3) = \
466-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBGREEN_$(2))
467-
468-
HLIBNATIVE_DEFAULT$(1)_H_$(3) = \
469-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBNATIVE_$(3))
470-
TLIBNATIVE_DEFAULT$(1)_T_$(2)_H_$(3) = \
471-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBNATIVE_$(2))
472-
473433
# Preqrequisites for using the stageN compiler
474434
ifeq ($(1),0)
475435
HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
@@ -481,8 +441,6 @@ HSREQ$(1)_H_$(3) = \
481441
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
482442
$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
483443
$$(HLIBRUSTUV_DEFAULT$(1)_H_$(3)) \
484-
$$(HLIBGREEN_DEFAULT$(1)_H_$(3)) \
485-
$$(HLIBNATIVE_DEFAULT$(1)_H_$(3)) \
486444
$$(MKFILE_DEPS)
487445
endif
488446

@@ -497,9 +455,7 @@ SREQ$(1)_T_$(2)_H_$(3) = \
497455
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
498456
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
499457
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
500-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2)) \
501-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBGREEN_$(2)) \
502-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBNATIVE_$(2))
458+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
503459

504460
# Prerequisites for a working stageN compiler and libraries, for a specific target
505461
CSREQ$(1)_T_$(2)_H_$(3) = \
@@ -514,9 +470,7 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
514470
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
515471
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
516472
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
517-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2)) \
518-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBGREEN_$(2)) \
519-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBNATIVE_$(2))
473+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
520474

521475
ifeq ($(1),0)
522476
# Don't run the the stage0 compiler under valgrind - that ship has sailed

‎branches/try/mk/clean.mk

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ clean$(1)_H_$(2):
9090
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB_$(2))
9191
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_EXTRALIB_$(2))
9292
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTUV_$(2))
93-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBNATIVE_$(2))
94-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBGREEN_$(2))
9593
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC_$(2))
9694
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX_$(2))
9795
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB_$(2))
@@ -100,10 +98,6 @@ clean$(1)_H_$(2):
10098
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_RGLOB_$(2))
10199
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTUV_GLOB_$(2))
102100
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTUV_RGLOB_$(2))
103-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBNATIVE_GLOB_$(2))
104-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBNATIVE_RGLOB_$(2))
105-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBGREEN_GLOB_$(2))
106-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBGREEN_RGLOB_$(2))
107101
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
108102
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
109103
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
@@ -130,8 +124,6 @@ clean$(1)_T_$(2)_H_$(3):
130124
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
131125
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
132126
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
133-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBGREEN_$(2))
134-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBNATIVE_$(2))
135127
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
136128
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
137129
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
@@ -140,10 +132,6 @@ clean$(1)_T_$(2)_H_$(3):
140132
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_RGLOB_$(2))
141133
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTUV_GLOB_$(2))
142134
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTUV_RGLOB_$(2))
143-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBNATIVE_GLOB_$(2))
144-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBNATIVE_RGLOB_$(2))
145-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBGREEN_GLOB_$(2))
146-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBGREEN_RGLOB_$(2))
147135
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
148136
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_RGLOB_$(2))
149137
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))

‎branches/try/mk/dist.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ PKG_FILES := \
3535
libextra \
3636
libstd \
3737
libsyntax \
38-
librustuv \
39-
libgreen \
40-
libnative \
4138
rt \
4239
librustdoc \
4340
rustllvm \

‎branches/try/mk/host.mk

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,24 @@ define CP_HOST_STAGE_N
2525

2626
$$(HBIN$(2)_H_$(4))/rustc$$(X_$(4)): \
2727
$$(TBIN$(1)_T_$(4)_H_$(3))/rustc$$(X_$(4)) \
28+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
2829
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
30+
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
31+
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
32+
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
33+
$$(HLIBRUSTC_DEFAULT$(2)_H_$(4)) \
34+
$$(HLIBSYNTAX_DEFAULT$(2)_H_$(4)) \
2935
| $$(HBIN$(2)_H_$(4))/
3036
@$$(call E, cp: $$@)
3137
$$(Q)cp $$< $$@
3238

3339
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
3440
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
3541
$$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)) \
42+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
43+
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
44+
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
45+
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
3646
| $$(HLIB$(2)_H_$(4))/
3747

3848
@$$(call E, cp: $$@)
@@ -45,11 +55,10 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
4555

4656
$$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
4757
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBSYNTAX_$(4)) \
58+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
4859
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
4960
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
5061
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
51-
$$(HLIBGREEN_DEFAULT$(2)_H_$(4)) \
52-
$$(HLIBNATIVE_DEFAULT$(2)_H_$(4)) \
5362
| $$(HLIB$(2)_H_$(4))/
5463
@$$(call E, cp: $$@)
5564
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(4)),$$(notdir $$@))
@@ -67,6 +76,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)): \
6776

6877
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
6978
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
79+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
7080
| $$(HLIB$(2)_H_$(4))/
7181
@$$(call E, cp: $$@)
7282
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
@@ -88,7 +98,8 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
8898

8999
$$(HLIB$(2)_H_$(4))/$(CFG_EXTRALIB_$(4)): \
90100
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
91-
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
101+
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)) \
102+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
92103
| $$(HLIB$(2)_H_$(4))/
93104
@$$(call E, cp: $$@)
94105
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
@@ -104,6 +115,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_EXTRALIB_$(4)): \
104115
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTUV_$(4)): \
105116
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTUV_$(4)) \
106117
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)) \
118+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
107119
| $$(HLIB$(2)_H_$(4))/
108120
@$$(call E, cp: $$@)
109121
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
@@ -116,36 +128,6 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTUV_$(4)): \
116128
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
117129
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_RGLOB_$(4)),$$(notdir $$@))
118130

119-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBGREEN_$(4)): \
120-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBGREEN_$(4)) \
121-
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)) \
122-
| $$(HLIB$(2)_H_$(4))/
123-
@$$(call E, cp: $$@)
124-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBGREEN_GLOB_$(4)),$$(notdir $$@))
125-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBGREEN_RGLOB_$(4)),$$(notdir $$@))
126-
$$(Q)cp $$< $$@
127-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBGREEN_GLOB_$(4)) \
128-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBGREEN_RGLOB_$(4))) \
129-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBGREEN_DSYM_GLOB_$(4))) \
130-
$$(HLIB$(2)_H_$(4))
131-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBGREEN_GLOB_$(4)),$$(notdir $$@))
132-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBGREEN_RGLOB_$(4)),$$(notdir $$@))
133-
134-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBNATIVE_$(4)): \
135-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBNATIVE_$(4)) \
136-
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)) \
137-
| $$(HLIB$(2)_H_$(4))/
138-
@$$(call E, cp: $$@)
139-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBNATIVE_GLOB_$(4)),$$(notdir $$@))
140-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBNATIVE_RGLOB_$(4)),$$(notdir $$@))
141-
$$(Q)cp $$< $$@
142-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBNATIVE_GLOB_$(4)) \
143-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBNATIVE_RGLOB_$(4))) \
144-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBNATIVE_DSYM_GLOB_$(4))) \
145-
$$(HLIB$(2)_H_$(4))
146-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBNATIVE_GLOB_$(4)),$$(notdir $$@))
147-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBNATIVE_RGLOB_$(4)),$$(notdir $$@))
148-
149131
$$(HBIN$(2)_H_$(4))/:
150132
mkdir -p $$@
151133

‎branches/try/mk/install.mk

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAG
9494
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_RGLOB_$(1)))
9595
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_GLOB_$(1)))
9696
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_RGLOB_$(1)))
97-
$$(Q)$$(call INSTALL_LIB,$$(LIBGREEN_GLOB_$(1)))
98-
$$(Q)$$(call INSTALL_LIB,$$(LIBGREEN_RGLOB_$(1)))
99-
$$(Q)$$(call INSTALL_LIB,$$(LIBNATIVE_GLOB_$(1)))
100-
$$(Q)$$(call INSTALL_LIB,$$(LIBNATIVE_RGLOB_$(1)))
10197
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
10298

10399
endef
@@ -113,10 +109,6 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
113109
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_RGLOB_$(1)))
114110
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_GLOB_$(1)))
115111
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_RGLOB_$(1)))
116-
$$(Q)$$(call INSTALL_LIB,$$(LIBGREEN_GLOB_$(1)))
117-
$$(Q)$$(call INSTALL_LIB,$$(LIBGREEN_RGLOB_$(1)))
118-
$$(Q)$$(call INSTALL_LIB,$$(LIBNATIVE_GLOB_$(1)))
119-
$$(Q)$$(call INSTALL_LIB,$$(LIBNATIVE_RGLOB_$(1)))
120112
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTC_GLOB_$(1)))
121113
$$(Q)$$(call INSTALL_LIB,$$(LIBSYNTAX_GLOB_$(1)))
122114
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTPKG_GLOB_$(1)))
@@ -157,7 +149,6 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
157149
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD)))
158150
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD)))
159151
$(Q)$(call INSTALL_LIB,$(LIBRUSTUV_GLOB_$(CFG_BUILD)))
160-
$(Q)$(call INSTALL_LIB,$(LIBGREEN_GLOB_$(CFG_BUILD)))
161152
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD)))
162153
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD)))
163154
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD)))
@@ -183,10 +174,6 @@ uninstall:
183174
$(call HOST_LIB_FROM_HL_GLOB,$(EXTRALIB_RGLOB_$(CFG_BUILD))) \
184175
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTUV_GLOB_$(CFG_BUILD))) \
185176
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTUV_RGLOB_$(CFG_BUILD))) \
186-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBGREEN_GLOB_$(CFG_BUILD))) \
187-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBGREEN_RGLOB_$(CFG_BUILD))) \
188-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBNATIVE_GLOB_$(CFG_BUILD))) \
189-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBNATIVE_RGLOB_$(CFG_BUILD))) \
190177
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD))) \
191178
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD))) \
192179
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD))) \
@@ -250,7 +237,6 @@ install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ
250237
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(STDLIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
251238
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(EXTRALIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
252239
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(LIBRUSTUV_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
253-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(LIBGREEN_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
254240
endef
255241

256242
define INSTALL_RUNTIME_TARGET_CLEANUP_N
@@ -259,7 +245,6 @@ install-runtime-target-$(1)-cleanup:
259245
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(STDLIB_GLOB_$(1)))
260246
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(EXTRALIB_GLOB_$(1)))
261247
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(LIBRUSTUV_GLOB_$(1)))
262-
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(LIBGREEN_GLOB_$(1)))
263248
endef
264249

265250
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD)))

‎branches/try/mk/rt.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ endif
7474

7575
RUNTIME_CS_$(1)_$(2) := \
7676
rt/rust_builtin.c \
77+
rt/rust_upcall.c \
7778
rt/miniz.c \
7879
rt/rust_android_dummy.c \
7980
rt/rust_test_helpers.c

0 commit comments

Comments
 (0)