Skip to content

Commit 71f4214

Browse files
brsonbrson
committed
---
yaml --- r: 15207 b: refs/heads/try c: a0ed1fb h: refs/heads/master i: 15205: 7db890d 15203: 703d2ad 15199: 65c7ec1 v: v3
1 parent bf522bc commit 71f4214

File tree

9 files changed

+43
-3
lines changed

9 files changed

+43
-3
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: c7082ce8e877af0e1b84a2f3710eb5234ff415fa
5+
refs/heads/try: a0ed1fb20b3aa3b2854b183f43060e562b4664eb
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

‎branches/try/Makefile.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,16 @@ CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
106106
CFG_CORELIB :=$(call CFG_LIB_NAME,core)
107107
CFG_STDLIB :=$(call CFG_LIB_NAME,std)
108108
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
109+
CFG_LIBRUSTSYNTAX :=$(call CFG_LIB_NAME,rustsyntax)
109110

110111
STDLIB_GLOB :=$(call CFG_LIB_GLOB,std)
111112
CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
112113
LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
114+
LIBRUSTSYNTAX_GLOB :=$(call CFG_LIB_GLOB,rustsyntax)
113115
STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
114116
CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
115117
LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
118+
LIBRUSTSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustsyntax)
116119

117120
# version-string calculation
118121
CFG_GIT_DIR := $(CFG_SRC_DIR).git
@@ -190,6 +193,10 @@ COMPILER_INPUTS := $(filter-out $(S)src/rustc/driver/rustc.rs, \
190193
$(wildcard $(addprefix $(S)src/rustc/, \
191194
rustc.rc *.rs */*.rs */*/*.rs)))
192195

196+
LIBRUSTSYNTAX_CRATE := $(S)src/librustsyntax/rustsyntax.rc
197+
LIBRUSTSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/librustsyntax/, \
198+
rustsyntax.rc *.rs))
199+
193200
RUSTC_INPUTS := $(S)src/rustc/driver/rustc.rs
194201

195202
######################################################################

‎branches/try/mk/clean.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ clean$(1)_H_$(2):
7070
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_CORELIB)
7171
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB)
7272
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC)
73+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTSYNTAX)
7374
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB)
7475
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB)
7576
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB)
77+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTSYNTAX_GLOB)
7678
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM)
7779
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
7880

@@ -94,9 +96,11 @@ clean$(1)_T_$(2)_H_$(3):
9496
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
9597
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
9698
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
99+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTSYNTAX)
97100
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB)
98101
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB)
99102
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB)
103+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTSYNTAX_GLOB)
100104
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM)
101105
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
102106
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a

‎branches/try/mk/dist.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ PKG_FILES := \
2828
etc \
2929
fuzzer \
3030
libcore \
31+
librustsyntax \
3132
libstd \
3233
rt \
3334
rustdoc \

‎branches/try/mk/host.mk

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ $$(HBIN$(2)_H_$(4))/rustc$$(X): \
2121
@$$(call E, cp: $$@)
2222
$$(Q)cp $$< $$@
2323

24-
# FIXME: The fuzzer depends on this. Remove once it's rpathed to correctly
25-
# find it in the appropriate target directory
2624
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
2725
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC) \
26+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTSYNTAX) \
2827
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) \
2928
$$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM) \
3029
$$(HCORELIB_DEFAULT$(2)_H_$(3)) \
@@ -35,6 +34,18 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
3534
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB) \
3635
$$(HLIB$(2)_H_$(4))
3736

37+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTSYNTAX): \
38+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTSYNTAX) \
39+
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) \
40+
$$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM) \
41+
$$(HCORELIB_DEFAULT$(2)_H_$(3)) \
42+
$$(HSTDLIB_DEFAULT$(2)_H_$(3))
43+
@$$(call E, cp: $$@)
44+
$$(Q)cp $$< $$@
45+
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTSYNTAX_GLOB) \
46+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTSYNTAX_DSYM_GLOB) \
47+
$$(HLIB$(2)_H_$(4))
48+
3849
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \
3950
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_RUNTIME)
4051
@$$(call E, cp: $$@)

‎branches/try/mk/install.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
4242
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB))
4343
$$(Q)$$(call INSTALL_LIB, \
4444
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
45+
$$(Q)$$(call INSTALL_LIB, \
46+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTSYNTAX_GLOB))
4547
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
4648

4749
endef
@@ -75,6 +77,7 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
7577
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
7678
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
7779
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
80+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTSYNTAX_GLOB))
7881
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
7982
$(Q)$(call INSTALL,$(S)/man, \
8083
$(PREFIX_ROOT)/share/man/man1,rustc.1)
@@ -95,6 +98,7 @@ uninstall:
9598
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \
9699
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \
97100
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \
101+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTSYNTAX_GLOB)) \
98102
; \
99103
do rm -f $$i ; \
100104
done

‎branches/try/mk/target.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X): \
3838

3939
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC): \
4040
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
41+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTSYNTAX)
42+
@$$(call E, compile_and_link: $$@)
43+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
44+
45+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTSYNTAX): \
46+
$$(LIBRUSTSYNTAX_CRATE) $$(LIBRUSTSYNTAX_INPUTS) \
4147
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
4248
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM) \
4349
$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3)) \

‎branches/try/src/librustsyntax/rustsyntax.rc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#[link(name = "rustsyntax",
2+
vers = "0.2",
3+
uuid = "c2b79dd0-a437-4ec7-95f9-858d77808c2f")];
4+
5+
#[crate_type = "lib"];

‎branches/try/src/rustc/rustc.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ use std (name = "std",
1313
vers = "0.2",
1414
url = "https://github.com/mozilla/rust/tree/master/src/libstd");
1515

16+
use rustsyntax;
17+
1618
mod middle {
1719
mod trans {
1820
mod common;

0 commit comments

Comments
 (0)