Skip to content

Commit bbacade

Browse files
pcwaltonpcwalton
committed
---
yaml --- r: 65215 b: refs/heads/master c: 0c820d4 h: refs/heads/master i: 65213: 4f24716 65211: 9e44f84 65207: dfca96d 65199: d9f5bb6 65183: 30e098a 65151: c8a2c60 v: v3
1 parent ca253ad commit bbacade

File tree

187 files changed

+3981
-4025
lines changed

Some content is hidden

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

187 files changed

+3981
-4025
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 565942b145efbf6c1d1f66db46423d721b55d32c
2+
refs/heads/master: 0c820d4123c754522b0655e9e74f692c55685bfa
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

‎trunk/Makefile.in

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ define DEF_LIBS
205205

206206
CFG_RUNTIME_$(1) :=$(call CFG_LIB_NAME_$(1),rustrt)
207207
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
208-
CFG_CORELIB_$(1) :=$(call CFG_LIB_NAME_$(1),core)
209208
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
209+
CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
210210
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
211211
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
212212
CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
@@ -215,17 +215,17 @@ CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
215215
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
216216
CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
217217

218-
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
219-
CORELIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),core)
218+
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
219+
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),core)
220220
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
221221
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
222222
LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
223223
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
224224
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
225225
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
226226
LIBRUST_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rust)
227+
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
227228
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
228-
CORELIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),core)
229229
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
230230
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
231231
LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
@@ -240,19 +240,19 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
240240
$(eval $(call DEF_LIBS,$(target))))
241241

242242
######################################################################
243-
# Core library variables
243+
# Standard library variables
244244
######################################################################
245245

246-
CORELIB_CRATE := $(S)src/libcore/core.rc
247-
CORELIB_INPUTS := $(wildcard $(addprefix $(S)src/libcore/, \
246+
STDLIB_CRATE := $(S)src/libstd/core.rc
247+
STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/, \
248248
core.rc *.rs */*.rs */*/*rs */*/*/*rs))
249249

250250
######################################################################
251-
# Standard library variables
251+
# Extra library variables
252252
######################################################################
253253

254-
STDLIB_CRATE := $(S)src/libstd/std.rc
255-
STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/, \
254+
EXTRALIB_CRATE := $(S)src/libextra/std.rc
255+
EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/, \
256256
std.rc *.rs */*.rs))
257257

258258
######################################################################
@@ -344,33 +344,33 @@ TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
344344
TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
345345
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/$$(CFG_LIBDIR)
346346

347-
# The name of the core and standard libraries used by rustc
347+
# The name of the standard and extra libraries used by rustc
348348
ifdef CFG_DISABLE_SHAREDSTD
349-
HCORELIB_DEFAULT$(1)_H_$(3) = \
350-
$$(HLIB$(1)_H_$(3))/libcore.rlib
351-
TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
352-
$$(TLIB$(1)_T_$(2)_H_$(3))/libcore.rlib
353-
354349
HSTDLIB_DEFAULT$(1)_H_$(3) = \
355350
$$(HLIB$(1)_H_$(3))/libstd.rlib
356351
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
357352
$$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
358353

354+
HEXTRALIB_DEFAULT$(1)_H_$(3) = \
355+
$$(HLIB$(1)_H_$(3))/libextra.rlib
356+
TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
357+
$$(TLIB$(1)_T_$(2)_H_$(3))/libextra.rlib
358+
359359
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
360360
$$(HLIB$(1)_H_$(3))/librustc.rlib
361361
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
362362
$$(TLIB$(1)_T_$(2)_H_$(3))/librustc.rlib
363363
else
364-
HCORELIB_DEFAULT$(1)_H_$(3) = \
365-
$$(HLIB$(1)_H_$(3))/$(CFG_CORELIB_$(3))
366-
TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
367-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2))
368-
369364
HSTDLIB_DEFAULT$(1)_H_$(3) = \
370365
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB_$(3))
371366
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
372367
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
373368

369+
HEXTRALIB_DEFAULT$(1)_H_$(3) = \
370+
$$(HLIB$(1)_H_$(3))/$(CFG_EXTRALIB_$(3))
371+
TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
372+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
373+
374374
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
375375
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
376376
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
@@ -382,8 +382,8 @@ HSREQ$(1)_H_$(3) = \
382382
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
383383
$$(HLIB$(1)_H_$(3))/$(CFG_RUNTIME_$(3)) \
384384
$$(HLIB$(1)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
385-
$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
386385
$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
386+
$$(HEXTRALIB_DEFAULT$(1)_H_$(3)) \
387387
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
388388
$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
389389
$$(MKFILE_DEPS)
@@ -397,8 +397,8 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
397397
# Prerequisites for a working stageN compiler and libraries, for a specific target
398398
SREQ$(1)_T_$(2)_H_$(3) = \
399399
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
400-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
401-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
400+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
401+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
402402

403403
# Prerequisites for a working stageN compiler and libraries, for a specific target
404404
CSREQ$(1)_T_$(2)_H_$(3) = \
@@ -413,8 +413,8 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
413413
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
414414
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
415415
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUST_$(3)) \
416-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
417-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
416+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
417+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
418418
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
419419
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
420420
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2)) \

‎trunk/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ fi
643643
step_msg "making directories"
644644

645645
for i in \
646-
doc doc/core doc/std \
646+
doc doc/std doc/extra \
647647
dl tmp
648648
do
649649
make_dir $i

‎trunk/mk/clean.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ clean$(1)_H_$(2):
7373
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
7474
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC_$(2))
7575
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME_$(2))
76-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_CORELIB_$(2))
7776
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB_$(2))
77+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_EXTRALIB_$(2))
7878
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC_$(2))
7979
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX_$(2))
8080
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTI_$(2))
8181
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUST_$(2))
82-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB_$(2))
8382
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB_$(2))
83+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_GLOB_$(2))
8484
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
8585
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
8686
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBFUZZER_GLOB_$(2))
@@ -111,14 +111,14 @@ clean$(1)_T_$(2)_H_$(3):
111111
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))
112112
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
113113
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2))
114-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2))
115114
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
115+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
116116
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
117117
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
118118
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2))
119119
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUST_$(2))
120-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB_$(2))
121120
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
121+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_GLOB_$(2))
122122
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
123123
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
124124
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBFUZZER_GLOB_$(2))

‎trunk/mk/dist.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ PKG_FILES := \
3333
compiletest \
3434
etc \
3535
libfuzzer \
36-
libcore \
37-
libsyntax \
36+
libextra \
3837
libstd \
38+
libsyntax \
3939
rt \
4040
librustdoc \
4141
rustllvm \

‎trunk/mk/docs.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ endif
173173

174174

175175
######################################################################
176-
# Rustdoc (libcore/std)
176+
# Rustdoc (libstd/extra)
177177
######################################################################
178178

179179
ifeq ($(CFG_PANDOC),)
@@ -199,8 +199,8 @@ doc/$(1)/rust.css: rust.css
199199
DOCS += doc/$(1)/index.html
200200
endef
201201

202-
$(eval $(call libdoc,core,$(CORELIB_CRATE),$(CORELIB_INPUTS)))
203202
$(eval $(call libdoc,std,$(STDLIB_CRATE),$(STDLIB_INPUTS)))
203+
$(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(EXTRALIB_INPUTS)))
204204
endif
205205

206206

‎trunk/mk/host.mk

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ $$(HBIN$(2)_H_$(4))/rustc$$(X_$(4)): \
2828
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
2929
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
3030
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
31-
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
3231
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
32+
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
3333
| $$(HBIN$(2)_H_$(4))/
3434

3535
@$$(call E, cp: $$@)
@@ -40,8 +40,8 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
4040
$$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)) \
4141
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
4242
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
43-
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
4443
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
44+
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
4545
| $$(HLIB$(2)_H_$(4))/
4646

4747
@$$(call E, cp: $$@)
@@ -54,8 +54,8 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
5454
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBSYNTAX_$(4)) \
5555
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
5656
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
57-
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
5857
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
58+
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
5959
| $$(HLIB$(2)_H_$(4))/
6060
@$$(call E, cp: $$@)
6161
$$(Q)cp $$< $$@
@@ -69,53 +69,53 @@ $$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)): \
6969
@$$(call E, cp: $$@)
7070
$$(Q)cp $$< $$@
7171

72-
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)): \
73-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_CORELIB_$(4)) \
72+
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
73+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
7474
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
7575
| $$(HLIB$(2)_H_$(4))/
7676
@$$(call E, cp: $$@)
7777
$$(Q)cp $$< $$@
78-
# Subtle: We do not let the shell expand $(CORELIB_DSYM_GLOB) directly rather
78+
# Subtle: We do not let the shell expand $(STDLIB_DSYM_GLOB) directly rather
7979
# we use Make's $$(wildcard) facility. The reason is that, on mac, when using
80-
# USE_SNAPSHOT_CORELIB, we copy the core.dylib file out of the snapshot.
80+
# USE_SNAPSHOT_STDLIB, we copy the std.dylib file out of the snapshot.
8181
# In that case, there is no .dSYM file. Annoyingly, bash then refuses to expand
82-
# glob, and cp reports an error because libcore-*.dylib.dsym does not exist.
82+
# glob, and cp reports an error because libstd-*.dylib.dsym does not exist.
8383
# Make instead expands the glob to nothing, which gives us the correct behavior.
8484
# (Copy .dsym file if it exists, but do nothing otherwise)
85-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_GLOB_$(4)) \
86-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_DSYM_GLOB_$(4))) \
85+
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB_$(4)) \
86+
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB_$(4))) \
8787
$$(HLIB$(2)_H_$(4))
8888

89-
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
90-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
91-
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)) \
89+
$$(HLIB$(2)_H_$(4))/$(CFG_EXTRALIB_$(4)): \
90+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
91+
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)) \
9292
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
9393
| $$(HLIB$(2)_H_$(4))/
9494
@$$(call E, cp: $$@)
9595
$$(Q)cp $$< $$@
96-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB_$(4)) \
97-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB_$(4))) \
96+
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(EXTRALIB_GLOB_$(4)) \
97+
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(EXTRALIB_DSYM_GLOB_$(4))) \
9898
$$(HLIB$(2)_H_$(4))
9999

100-
$$(HLIB$(2)_H_$(4))/libcore.rlib: \
101-
$$(TLIB$(1)_T_$(4)_H_$(3))/libcore.rlib \
100+
$$(HLIB$(2)_H_$(4))/libstd.rlib: \
101+
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
102102
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
103103
| $$(HLIB$(2)_H_$(4))/
104104
@$$(call E, cp: $$@)
105105
$$(Q)cp $$< $$@
106106

107-
$$(HLIB$(2)_H_$(4))/libstd.rlib: \
108-
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
109-
$$(HLIB$(2)_H_$(4))/libcore.rlib \
107+
$$(HLIB$(2)_H_$(4))/libextra.rlib: \
108+
$$(TLIB$(1)_T_$(4)_H_$(3))/libextra.rlib \
109+
$$(HLIB$(2)_H_$(4))/libstd.rlib \
110110
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
111111
| $$(HLIB$(2)_H_$(4))/
112112
@$$(call E, cp: $$@)
113113
$$(Q)cp $$< $$@
114114

115115
$$(HLIB$(2)_H_$(4))/librustc.rlib: \
116116
$$(TLIB$(1)_T_$(4)_H_$(3))/librustc.rlib \
117-
$$(HLIB$(2)_H_$(4))/libcore.rlib \
118117
$$(HLIB$(2)_H_$(4))/libstd.rlib \
118+
$$(HLIB$(2)_H_$(4))/libextra.rlib \
119119
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
120120
| $$(HLIB$(2)_H_$(4))/
121121
@$$(call E, cp: $$@)

‎trunk/mk/install.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ define INSTALL_TARGET_N
5252
install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
5353
$$(Q)mkdir -p $$(PTL$(1)$(2))
5454
$$(Q)$$(call INSTALL_LIB,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
55-
$$(Q)$$(call INSTALL_LIB, \
56-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB_$(1)))
5755
$$(Q)$$(call INSTALL_LIB, \
5856
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB_$(1)))
57+
$$(Q)$$(call INSTALL_LIB, \
58+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(EXTRALIB_GLOB_$(1)))
5959
$$(Q)$$(call INSTALL_LIB,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
6060

6161
endef
@@ -64,10 +64,10 @@ define INSTALL_HOST_N
6464
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
6565
$$(Q)mkdir -p $$(PTL$(1)$(2))
6666
$$(Q)$$(call INSTALL_LIB,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME_$(1)))
67-
$$(Q)$$(call INSTALL_LIB, \
68-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB_$(1)))
6967
$$(Q)$$(call INSTALL_LIB, \
7068
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB_$(1)))
69+
$$(Q)$$(call INSTALL_LIB, \
70+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(EXTRALIB_GLOB_$(1)))
7171
$$(Q)$$(call INSTALL_LIB, \
7272
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB_$(1)))
7373
$$(Q)$$(call INSTALL_LIB, \
@@ -113,8 +113,8 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
113113
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
114114
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X_$(CFG_BUILD_TRIPLE)))
115115
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X_$(CFG_BUILD_TRIPLE)))
116-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB_$(CFG_BUILD_TRIPLE)))
117116
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
117+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE)))
118118
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
119119
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE)))
120120
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE)))
@@ -141,8 +141,8 @@ uninstall:
141141
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
142142
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
143143
$(Q)for i in \
144-
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB_$(CFG_BUILD_TRIPLE))) \
145144
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE))) \
145+
$(call HOST_LIB_FROM_HL_GLOB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE))) \
146146
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE))) \
147147
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE))) \
148148
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
@@ -203,16 +203,16 @@ define INSTALL_RUNTIME_TARGET_N
203203
install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
204204
$(Q)$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR))
205205
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CFG_RUNTIME_$(1)),$(CFG_RUNTIME_PUSH_DIR))
206-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CORELIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
207206
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(STDLIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
207+
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(EXTRALIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
208208
endef
209209

210210
define INSTALL_RUNTIME_TARGET_CLEANUP_N
211211
install-runtime-target-$(1)-cleanup:
212212
$(Q)$(call ADB,remount)
213213
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(CFG_RUNTIME_$(1)))
214-
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(CORELIB_GLOB_$(1)))
215214
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(STDLIB_GLOB_$(1)))
215+
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(EXTRALIB_GLOB_$(1)))
216216
endef
217217

218218
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD_TRIPLE)))

‎trunk/mk/pp.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
ifdef PPFILES
1313
PP_INPUTS_FILTERED := $(wildcard $(PPFILES))
1414
else
15-
PP_INPUTS = $(wildcard $(addprefix $(S)src/libcore/,*.rs */*.rs)) \
16-
$(wildcard $(addprefix $(S)src/libstd/,*.rs */*.rs)) \
15+
PP_INPUTS = $(wildcard $(addprefix $(S)src/libstd/,*.rs */*.rs)) \
16+
$(wildcard $(addprefix $(S)src/libextra/,*.rs */*.rs)) \
1717
$(wildcard $(addprefix $(S)src/rustc/,*.rs */*.rs */*/*.rs)) \
1818
$(wildcard $(S)src/test/*/*.rs \
1919
$(S)src/test/*/*/*.rs) \

0 commit comments

Comments
 (0)