Skip to content

Commit 285ec2f

Browse files
jldjld
committed
---
yaml --- r: 146295 b: refs/heads/try2 c: f1124a2 h: refs/heads/master i: 146293: fbb65dc 146291: 52e84c3 146287: da3cc09 v: v3
1 parent fc4e900 commit 285ec2f

Some content is hidden

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

87 files changed

+1182
-1220
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: e42e378f32e212997fc42281112b1c9c4c247de0
8+
refs/heads/try2: f1124a2f55406be8e758488352c59ae9deef17b3
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -221,22 +221,19 @@ CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
221221
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
222222
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
223223
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
224-
CFG_LIBRUSTUV_$(1) :=$(call CFG_LIB_NAME_$(1),rustuv)
225224

226225
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
227226
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
228227
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
229228
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
230229
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
231230
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
232-
LIBRUSTUV_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustuv)
233231
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
234232
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
235233
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
236234
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
237235
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
238236
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
239-
LIBRUSTUV_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustuv)
240237

241238
endef
242239

@@ -292,14 +289,6 @@ EXTRALIB_CRATE := $(S)src/libextra/extra.rs
292289
EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/, \
293290
*.rs */*.rs))
294291

295-
######################################################################
296-
# Rust UV library variables
297-
######################################################################
298-
299-
LIBRUSTUV_CRATE := $(S)src/librustuv/rustuv.rs
300-
LIBRUSTUV_INPUTS := $(wildcard $(addprefix $(S)src/librustuv/, \
301-
*.rs */*.rs))
302-
303292
######################################################################
304293
# rustc crate variables
305294
######################################################################
@@ -421,11 +410,6 @@ else
421410
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
422411
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
423412
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
424-
425-
HLIBRUSTUV_DEFAULT$(1)_H_$(3) = \
426-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTUV_$(3))
427-
TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3) = \
428-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
429413
endif
430414

431415
# Preqrequisites for using the stageN compiler
@@ -437,7 +421,6 @@ HSREQ$(1)_H_$(3) = \
437421
$$(HEXTRALIB_DEFAULT$(1)_H_$(3)) \
438422
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
439423
$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
440-
$$(HLIBRUSTUV_DEFAULT$(1)_H_$(3)) \
441424
$$(MKFILE_DEPS)
442425

443426
# Prerequisites for using the stageN compiler to build target artifacts
@@ -450,8 +433,7 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
450433
SREQ$(1)_T_$(2)_H_$(3) = \
451434
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
452435
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
453-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
454-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
436+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
455437

456438
# Prerequisites for a working stageN compiler and libraries, for a specific target
457439
CSREQ$(1)_T_$(2)_H_$(3) = \
@@ -465,8 +447,7 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
465447
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
466448
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
467449
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
468-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
469-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
450+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
470451

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

‎branches/try2/doc/tutorial.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ types.
491491
use std::f64;
492492
use std::num::atan;
493493
fn angle(vector: (f64, f64)) -> f64 {
494-
let pi = f64::consts::PI;
494+
let pi = f64::consts::pi;
495495
match vector {
496496
(0.0, y) if y < 0.0 => 1.5 * pi,
497497
(0.0, y) => 0.5 * pi,
@@ -689,7 +689,7 @@ use std::f64;
689689
# enum Shape { Circle(Point, f64), Rectangle(Point, Point) }
690690
fn area(sh: Shape) -> f64 {
691691
match sh {
692-
Circle(_, size) => f64::consts::PI * size * size,
692+
Circle(_, size) => f64::consts::pi * size * size,
693693
Rectangle(Point { x, y }, Point { x: x2, y: y2 }) => (x2 - x) * (y2 - y)
694694
}
695695
}
@@ -725,7 +725,7 @@ enum Shape {
725725
}
726726
fn area(sh: Shape) -> f64 {
727727
match sh {
728-
Circle { radius: radius, _ } => f64::consts::PI * square(radius),
728+
Circle { radius: radius, _ } => f64::consts::pi * square(radius),
729729
Rectangle { top_left: top_left, bottom_right: bottom_right } => {
730730
(bottom_right.x - top_left.x) * (top_left.y - bottom_right.y)
731731
}
@@ -1699,10 +1699,10 @@ impl Circle {
16991699
To call such a method, just prefix it with the type name and a double colon:
17001700

17011701
~~~~
1702-
use std::f64::consts::PI;
1702+
use std::f64::consts::pi;
17031703
struct Circle { radius: f64 }
17041704
impl Circle {
1705-
fn new(area: f64) -> Circle { Circle { radius: (area / PI).sqrt() } }
1705+
fn new(area: f64) -> Circle { Circle { radius: (area / pi).sqrt() } }
17061706
}
17071707
let c = Circle::new(42.5);
17081708
~~~~
@@ -1977,13 +1977,13 @@ name and a double colon. The compiler uses type inference to decide which
19771977
implementation to use.
19781978

19791979
~~~~
1980-
use std::f64::consts::PI;
1980+
use std::f64::consts::pi;
19811981
trait Shape { fn new(area: f64) -> Self; }
19821982
struct Circle { radius: f64 }
19831983
struct Square { length: f64 }
19841984
19851985
impl Shape for Circle {
1986-
fn new(area: f64) -> Circle { Circle { radius: (area / PI).sqrt() } }
1986+
fn new(area: f64) -> Circle { Circle { radius: (area / pi).sqrt() } }
19871987
}
19881988
impl Shape for Square {
19891989
fn new(area: f64) -> Square { Square { length: (area).sqrt() } }
@@ -2157,17 +2157,17 @@ trait Circle : Shape { fn radius(&self) -> f64; }
21572157
Now, we can implement `Circle` on a type only if we also implement `Shape`.
21582158

21592159
~~~~
2160-
use std::f64::consts::PI;
2160+
use std::f64::consts::pi;
21612161
# trait Shape { fn area(&self) -> f64; }
21622162
# trait Circle : Shape { fn radius(&self) -> f64; }
21632163
# struct Point { x: f64, y: f64 }
21642164
# fn square(x: f64) -> f64 { x * x }
21652165
struct CircleStruct { center: Point, radius: f64 }
21662166
impl Circle for CircleStruct {
2167-
fn radius(&self) -> f64 { (self.area() / PI).sqrt() }
2167+
fn radius(&self) -> f64 { (self.area() / pi).sqrt() }
21682168
}
21692169
impl Shape for CircleStruct {
2170-
fn area(&self) -> f64 { PI * square(self.radius) }
2170+
fn area(&self) -> f64 { pi * square(self.radius) }
21712171
}
21722172
~~~~
21732173

@@ -2192,13 +2192,13 @@ fn radius_times_area<T: Circle>(c: T) -> f64 {
21922192
Likewise, supertrait methods may also be called on trait objects.
21932193

21942194
~~~ {.xfail-test}
2195-
use std::f64::consts::PI;
2195+
use std::f64::consts::pi;
21962196
# trait Shape { fn area(&self) -> f64; }
21972197
# trait Circle : Shape { fn radius(&self) -> f64; }
21982198
# struct Point { x: f64, y: f64 }
21992199
# struct CircleStruct { center: Point, radius: f64 }
2200-
# impl Circle for CircleStruct { fn radius(&self) -> f64 { (self.area() / PI).sqrt() } }
2201-
# impl Shape for CircleStruct { fn area(&self) -> f64 { PI * square(self.radius) } }
2200+
# impl Circle for CircleStruct { fn radius(&self) -> f64 { (self.area() / pi).sqrt() } }
2201+
# impl Shape for CircleStruct { fn area(&self) -> f64 { pi * square(self.radius) } }
22022202
22032203
let concrete = @CircleStruct{center:Point{x:3f,y:4f},radius:5f};
22042204
let mycircle: @Circle = concrete as @Circle;

‎branches/try2/mk/clean.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ clean$(1)_H_$(2):
7373
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME_$(2))
7474
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB_$(2))
7575
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_EXTRALIB_$(2))
76-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTUV_$(2))
7776
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC_$(2))
7877
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX_$(2))
7978
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB_$(2))
@@ -104,12 +103,10 @@ clean$(1)_T_$(2)_H_$(3):
104103
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2))
105104
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
106105
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
107-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
108106
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
109107
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
110108
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
111109
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_GLOB_$(2))
112-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTUV_GLOB_$(2))
113110
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
114111
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
115112
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))

‎branches/try2/mk/host.mk

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ $$(HBIN$(2)_H_$(4))/rustc$$(X_$(4)): \
3030
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
3131
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
3232
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
33-
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
3433
| $$(HBIN$(2)_H_$(4))/
3534

3635
@$$(call E, cp: $$@)
@@ -43,7 +42,6 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
4342
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
4443
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
4544
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
46-
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
4745
| $$(HLIB$(2)_H_$(4))/
4846

4947
@$$(call E, cp: $$@)
@@ -60,7 +58,6 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
6058
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
6159
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
6260
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
63-
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
6461
| $$(HLIB$(2)_H_$(4))/
6562
@$$(call E, cp: $$@)
6663
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(4)),$$(notdir $$@))
@@ -83,7 +80,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
8380
@$$(call E, cp: $$@)
8481
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
8582
$$(Q)cp $$< $$@
86-
# Subtle: We do not let the shell expand $$(STDLIB_DSYM_GLOB) directly rather
83+
# Subtle: We do not let the shell expand $(STDLIB_DSYM_GLOB) directly rather
8784
# we use Make's $$(wildcard) facility. The reason is that, on mac, when using
8885
# USE_SNAPSHOT_STDLIB, we copy the std.dylib file out of the snapshot.
8986
# In that case, there is no .dSYM file. Annoyingly, bash then refuses to expand
@@ -108,19 +105,6 @@ $$(HLIB$(2)_H_$(4))/$(CFG_EXTRALIB_$(4)): \
108105
$$(HLIB$(2)_H_$(4))
109106
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
110107

111-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTUV_$(4)): \
112-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTUV_$(4)) \
113-
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)) \
114-
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
115-
| $$(HLIB$(2)_H_$(4))/
116-
@$$(call E, cp: $$@)
117-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
118-
$$(Q)cp $$< $$@
119-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTUV_GLOB_$(4)) \
120-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTUV_DSYM_GLOB_$(4))) \
121-
$$(HLIB$(2)_H_$(4))
122-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
123-
124108
$$(HLIB$(2)_H_$(4))/libstd.rlib: \
125109
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
126110
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \

‎branches/try2/mk/install.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ install-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAG
9191
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUNTIME_$(1)))
9292
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
9393
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
94-
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_GLOB_$(1)))
9594
$$(Q)$$(call INSTALL_LIB,libmorestack.a)
9695

9796
endef
@@ -105,7 +104,6 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
105104
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUSTLLVM_$(1)))
106105
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
107106
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
108-
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTUV_GLOB_$(1)))
109107
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTC_GLOB_$(1)))
110108
$$(Q)$$(call INSTALL_LIB,$$(LIBSYNTAX_GLOB_$(1)))
111109
$$(Q)$$(call INSTALL_LIB,$$(LIBRUSTPKG_GLOB_$(1)))
@@ -145,7 +143,6 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
145143
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
146144
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
147145
$(Q)$(call INSTALL_LIB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE)))
148-
$(Q)$(call INSTALL_LIB,$(LIBRUSTUV_GLOB_$(CFG_BUILD_TRIPLE)))
149146
$(Q)$(call INSTALL_LIB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE)))
150147
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE)))
151148
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE)))
@@ -171,7 +168,6 @@ uninstall:
171168
$(Q)for i in \
172169
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE))) \
173170
$(call HOST_LIB_FROM_HL_GLOB,$(EXTRALIB_GLOB_$(CFG_BUILD_TRIPLE))) \
174-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTUV_GLOB_$(CFG_BUILD_TRIPLE))) \
175171
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB_$(CFG_BUILD_TRIPLE))) \
176172
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE))) \
177173
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
@@ -234,7 +230,6 @@ install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ
234230
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CFG_RUNTIME_$(1)),$(CFG_RUNTIME_PUSH_DIR))
235231
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(STDLIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
236232
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(EXTRALIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
237-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(LIBRUSTUV_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
238233
endef
239234

240235
define INSTALL_RUNTIME_TARGET_CLEANUP_N
@@ -243,7 +238,6 @@ install-runtime-target-$(1)-cleanup:
243238
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(CFG_RUNTIME_$(1)))
244239
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(STDLIB_GLOB_$(1)))
245240
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(EXTRALIB_GLOB_$(1)))
246-
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(LIBRUSTUV_GLOB_$(1)))
247241
endef
248242

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

‎branches/try2/mk/rt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ $$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MK
148148

149149
# These could go in rt.mk or rustllvm.mk, they're needed for both.
150150

151-
# This regexp has a single $$ escaped twice
151+
# This regexp has a single $, escaped twice
152152
$(1)/%.bsd.def: %.def.in $$(MKFILE_DEPS)
153153
@$$(call E, def: $$@)
154154
$$(Q)echo "{" > $$@

‎branches/try2/mk/stage0.mk

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ $(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_EXTRALIB_$(CFG_BUILD_TRIPLE)): \
4242
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
4343
$(Q)touch $@
4444

45-
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTUV_$(CFG_BUILD_TRIPLE)): \
46-
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
47-
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
48-
$(Q)touch $@
49-
5045
$(HLIB0_H_$(CFG_BUILD_TRIPLE))/$(CFG_LIBRUSTC_$(CFG_BUILD_TRIPLE)): \
5146
$(HBIN0_H_$(CFG_BUILD_TRIPLE))/rustc$(X_$(CFG_BUILD_TRIPLE)) \
5247
| $(HLIB0_H_$(CFG_BUILD_TRIPLE))/
@@ -86,9 +81,9 @@ $$(HLIB0_H_$(1))/$(CFG_STDLIB_$(1)): \
8681
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_STDLIB_$(1)) \
8782
| $(HLIB0_H_$(1))/
8883
@$$(call E, cp: $$@)
89-
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
84+
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
9085
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(STDLIB_GLOB_$(1)) $$@
91-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
86+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
9287

9388
$$(HLIB0_H_$(1))/$(CFG_EXTRALIB_$(1)): \
9489
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_EXTRALIB_$(1)) \
@@ -98,14 +93,6 @@ $$(HLIB0_H_$(1))/$(CFG_EXTRALIB_$(1)): \
9893
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(EXTRALIB_GLOB_$(1)) $$@
9994
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
10095

101-
$$(HLIB0_H_$(1))/$(CFG_LIBRUSTUV_$(1)): \
102-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_LIBRUSTUV_$(1)) \
103-
| $(HLIB0_H_$(1))/
104-
@$$(call E, cp: $$@)
105-
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
106-
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(LIBRUSTUV_GLOB_$(1)) $$@
107-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
108-
10996
$$(HLIB0_H_$(1))/$(CFG_LIBRUSTC_$(1)): \
11097
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_LIBRUSTC_$(1)) \
11198
| $(HLIB0_H_$(1))/

‎branches/try2/mk/target.mk

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,11 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)): \
7373
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
7474
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(2)),$$(notdir $$@))
7575

76-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2)): \
77-
$$(LIBRUSTUV_CRATE) $$(LIBRUSTUV_INPUTS) \
78-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
79-
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
80-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
81-
@$$(call E, compile_and_link: $$@)
82-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(2)),$$(notdir $$@))
83-
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
84-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(2)),$$(notdir $$@))
85-
8676
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
8777
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
8878
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
8979
$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3)) \
9080
$$(TEXTRALIB_DEFAULT$(1)_T_$(2)_H_$(3)) \
91-
$$(TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3)) \
9281
| $$(TLIB$(1)_T_$(2)_H_$(3))/
9382
@$$(call E, compile_and_link: $$@)
9483
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(2)),$$(notdir $$@))

0 commit comments

Comments
 (0)