Skip to content

Commit 81503ee

Browse files
borsbors
committed
---
yaml --- r: 92166 b: refs/heads/auto c: 4e0cb31 h: refs/heads/master v: v3
1 parent b707c9a commit 81503ee

File tree

153 files changed

+2267
-2004
lines changed

Some content is hidden

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

153 files changed

+2267
-2004
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 4051713625d7b75846619a3ba74d0ada8695c5a9
16+
refs/heads/auto: 4e0cb316fc980f00e1b74f3fdb7a842b540be280
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,4 @@ src/etc/dl
9090
.settings/
9191
build/
9292
i686-pc-mingw32/
93+
src/librustc/lib/llvmdeps.rs

‎branches/auto/Makefile.in

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,13 @@ endif
134134
# static copies of libstd and libextra. We also generate dynamic versions of all
135135
# libraries, so in the interest of space, prefer dynamic linking throughout the
136136
# compilation process.
137+
#
138+
# Note though that these flags are omitted for stage2+. This means that the
139+
# snapshot will be generated with a statically linked rustc so we only have to
140+
# worry about the distribution of one file (with its native dynamic
141+
# dependencies)
137142
RUSTFLAGS_STAGE0 += -Z prefer-dynamic
138143
RUSTFLAGS_STAGE1 += -Z prefer-dynamic
139-
RUSTFLAGS_STAGE2 += -Z prefer-dynamic
140-
RUSTFLAGS_STAGE3 += -Z prefer-dynamic
141144

142145
# platform-specific auto-configuration
143146
include $(CFG_SRC_DIR)mk/platform.mk
@@ -224,7 +227,7 @@ GENERATED :=
224227
define DEF_LIBS
225228

226229
CFG_RUNTIME_$(1) :=$(call CFG_STATIC_LIB_NAME_$(1),rustrt)
227-
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
230+
CFG_RUSTLLVM_$(1) :=$(call CFG_STATIC_LIB_NAME_$(1),rustllvm)
228231
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
229232
CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
230233
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
@@ -251,6 +254,8 @@ LIBRUSTUV_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustuv)
251254
EXTRALIB_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,extra)
252255
STDLIB_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,std)
253256
LIBRUSTUV_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,rustuv)
257+
LIBSYNTAX_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,syntax)
258+
LIBRUSTC_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,rustc)
254259

255260
endef
256261

@@ -426,16 +431,18 @@ TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3) = \
426431
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTUV_$(2))
427432

428433
# Preqrequisites for using the stageN compiler
434+
ifeq ($(1),0)
435+
HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
436+
else
429437
HSREQ$(1)_H_$(3) = \
430438
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
431-
$$(HLIB$(1)_H_$(3))/$(CFG_RUNTIME_$(3)) \
432-
$$(HLIB$(1)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
433439
$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
434440
$$(HEXTRALIB_DEFAULT$(1)_H_$(3)) \
435441
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
436442
$$(HLIBRUSTC_DEFAULT$(1)_H_$(3)) \
437443
$$(HLIBRUSTUV_DEFAULT$(1)_H_$(3)) \
438444
$$(MKFILE_DEPS)
445+
endif
439446

440447
# Prerequisites for using the stageN compiler to build target artifacts
441448
TSREQ$(1)_T_$(2)_H_$(3) = \

‎branches/auto/mk/clean.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@ clean$(1)_T_$(2)_H_$(3):
132132
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTUV_GLOB_$(2))
133133
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTUV_RGLOB_$(2))
134134
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
135+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_RGLOB_$(2))
135136
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
137+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_RGLOB_$(2))
136138
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
137139
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
138140
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))

‎branches/auto/mk/host.mk

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,20 @@ define CP_HOST_STAGE_N
2626
$$(HBIN$(2)_H_$(4))/rustc$$(X_$(4)): \
2727
$$(TBIN$(1)_T_$(4)_H_$(3))/rustc$$(X_$(4)) \
2828
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
29-
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
3029
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
3130
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
3231
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
3332
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
33+
$$(HLIBRUSTC_DEFAULT$(2)_H_$(4)) \
34+
$$(HLIBSYNTAX_DEFAULT$(2)_H_$(4)) \
3435
| $$(HBIN$(2)_H_$(4))/
35-
3636
@$$(call E, cp: $$@)
3737
$$(Q)cp $$< $$@
3838

3939
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
4040
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
4141
$$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)) \
4242
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
43-
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
4443
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
4544
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
4645
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
@@ -57,7 +56,6 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
5756
$$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
5857
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBSYNTAX_$(4)) \
5958
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
60-
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
6159
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
6260
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
6361
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
@@ -130,12 +128,6 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTUV_$(4)): \
130128
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
131129
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_RGLOB_$(4)),$$(notdir $$@))
132130

133-
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
134-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUSTLLVM_$(4)) \
135-
| $$(HLIB$(2)_H_$(4))/
136-
@$$(call E, cp: $$@)
137-
$$(Q)cp $$< $$@
138-
139131
$$(HBIN$(2)_H_$(4))/:
140132
mkdir -p $$@
141133

‎branches/auto/mk/install.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ install-target-$(1)-host-$(2): LIB_SOURCE_DIR=$$(TL$(1)$(2))
103103
install-target-$(1)-host-$(2): LIB_DESTIN_DIR=$$(PTL$(1)$(2))
104104
install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
105105
$$(Q)$$(call MK_INSTALL_DIR,$$(PTL$(1)$(2)))
106-
$$(Q)$$(call INSTALL_LIB,$$(CFG_RUSTLLVM_$(1)))
107106
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
108107
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_RGLOB_$(1)))
109108
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
@@ -154,7 +153,6 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
154153
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD)))
155154
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD)))
156155
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD)))
157-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD)))
158156
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustc.1)
159157
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustdoc.1)
160158
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustpkg.1)
@@ -169,7 +167,6 @@ uninstall:
169167
$(Q)rm -f $(PHB)/rustc$(X_$(CFG_BUILD))
170168
$(Q)rm -f $(PHB)/rustpkg$(X_$(CFG_BUILD))
171169
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD))
172-
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD))
173170
$(Q)for i in \
174171
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD))) \
175172
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_RGLOB_$(CFG_BUILD))) \

‎branches/auto/mk/llvm.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,15 @@ $$(LLVM_STAMP_$(1)): $(S)src/rustllvm/llvm-auto-clean-trigger
4444

4545
endef
4646

47+
$(foreach host,$(CFG_HOST), \
48+
$(eval LLVM_CONFIGS := $(LLVM_CONFIGS) $(LLVM_CONFIG_$(host))))
49+
50+
$(S)src/librustc/lib/llvmdeps.rs: \
51+
$(LLVM_CONFIGS) \
52+
$(S)src/etc/mklldeps.py
53+
$(Q)$(CFG_PYTHON) $(S)src/etc/mklldeps.py \
54+
"$(LLVM_COMPONENTS)" $(LLVM_CONFIGS) \
55+
> $@
56+
4757
$(foreach host,$(CFG_HOST), \
4858
$(eval $(call DEF_LLVM_RULES,$(host))))

‎branches/auto/mk/rustllvm.mk

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ RUSTLLVM_INCS_$(1) = $$(LLVM_EXTRA_INCDIRS_$(1)) \
3232
RUSTLLVM_OBJS_OBJS_$(1) := $$(RUSTLLVM_OBJS_CS_$(1):rustllvm/%.cpp=$(1)/rustllvm/%.o)
3333
ALL_OBJ_FILES += $$(RUSTLLVM_OBJS_OBJS_$(1))
3434

35-
$(1)/rustllvm/$(CFG_RUSTLLVM_$(1)): $$(RUSTLLVM_OBJS_OBJS_$(1)) \
36-
$$(MKFILE_DEPS) $$(RUSTLLVM_DEF_$(1))
35+
$(1)/rustllvm/$(CFG_RUSTLLVM_$(1)): $$(RUSTLLVM_OBJS_OBJS_$(1))
3736
@$$(call E, link: $$@)
38-
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@,$$(RUSTLLVM_OBJS_OBJS_$(1)) \
39-
$$(CFG_GCCISH_PRE_LIB_FLAGS_$(1)) $$(LLVM_LIBS_$(1)) \
40-
$$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) \
41-
$$(LLVM_LDFLAGS_$(1)),$$(RUSTLLVM_DEF_$(1)),$$(CFG_RUSTLLVM_$(1)))
37+
$$(Q)$$(AR_$(1)) rcs $$@ $$(RUSTLLVM_OBJS_OBJS_$(1))
4238

4339
$(1)/rustllvm/%.o: rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
4440
@$$(call E, compile: $$@)

‎branches/auto/mk/stage0.mk

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,6 @@ endif
2525
endif
2626
$(Q)touch $@
2727

28-
# Host libs will be extracted by the above rule
29-
30-
$(HLIB0_H_$(CFG_BUILD))/$(CFG_RUNTIME_$(CFG_BUILD)): \
31-
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
32-
| $(HLIB0_H_$(CFG_BUILD))/
33-
$(Q)touch $@
34-
35-
$(HLIB0_H_$(CFG_BUILD))/$(CFG_STDLIB_$(CFG_BUILD)): \
36-
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
37-
| $(HLIB0_H_$(CFG_BUILD))/
38-
$(Q)touch $@
39-
40-
$(HLIB0_H_$(CFG_BUILD))/$(CFG_EXTRALIB_$(CFG_BUILD)): \
41-
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
42-
| $(HLIB0_H_$(CFG_BUILD))/
43-
$(Q)touch $@
44-
45-
$(HLIB0_H_$(CFG_BUILD))/$(CFG_LIBRUSTUV_$(CFG_BUILD)): \
46-
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
47-
| $(HLIB0_H_$(CFG_BUILD))/
48-
$(Q)touch $@
49-
50-
$(HLIB0_H_$(CFG_BUILD))/$(CFG_LIBRUSTC_$(CFG_BUILD)): \
51-
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
52-
| $(HLIB0_H_$(CFG_BUILD))/
53-
$(Q)touch $@
54-
55-
$(HLIB0_H_$(CFG_BUILD))/$(CFG_RUSTLLVM_$(CFG_BUILD)): \
56-
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
57-
| $(HLIB0_H_$(CFG_BUILD))/
58-
$(Q)touch $@
59-
6028
# For other targets, let the host build the target:
6129

6230
define BOOTSTRAP_STAGE0
@@ -76,50 +44,6 @@ $$(HBIN0_H_$(1))/rustc$$(X_$(1)): \
7644
@$$(call E, cp: $$@)
7745
$$(Q)cp $$< $$@
7846

79-
$$(HLIB0_H_$(1))/$(CFG_RUNTIME_$(1)): \
80-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_RUNTIME_$(1)) \
81-
| $(HLIB0_H_$(1))/
82-
@$$(call E, cp: $$@)
83-
$$(Q)cp $$< $$@
84-
85-
$$(HLIB0_H_$(1))/$(CFG_STDLIB_$(1)): \
86-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_STDLIB_$(1)) \
87-
| $(HLIB0_H_$(1))/
88-
@$$(call E, cp: $$@)
89-
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
90-
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(STDLIB_GLOB_$(1)) $$@
91-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(STDLIB_GLOB_$(4)),$$(notdir $$@))
92-
93-
$$(HLIB0_H_$(1))/$(CFG_EXTRALIB_$(1)): \
94-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_EXTRALIB_$(1)) \
95-
| $(HLIB0_H_$(1))/
96-
@$$(call E, cp: $$@)
97-
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
98-
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(EXTRALIB_GLOB_$(1)) $$@
99-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(EXTRALIB_GLOB_$(4)),$$(notdir $$@))
100-
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-
109-
$$(HLIB0_H_$(1))/$(CFG_LIBRUSTC_$(1)): \
110-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_LIBRUSTC_$(1)) \
111-
| $(HLIB0_H_$(1))/
112-
@$$(call E, cp: $$@)
113-
$$(call CHECK_FOR_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(4)),$$(notdir $$@))
114-
$$(Q)cp $$(TLIB$(2)_T_$(1)_H_$(3))/$(LIBRUSTC_GLOB_$(1)) $$@
115-
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(4)),$$(notdir $$@))
116-
117-
$$(HLIB0_H_$(1))/$(CFG_RUSTLLVM_$(1)): \
118-
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_RUSTLLVM_$(1)) \
119-
| $(HLIB0_H_$(1))/
120-
@$$(call E, cp: $$@)
121-
$$(Q)cp $$< $$@
122-
12347
endef
12448

12549
# Use stage1 to build other architectures: then you don't have to wait

‎branches/auto/mk/target.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
103103
| $$(TLIB$(1)_T_$(2)_H_$(3))/
104104
@$$(call E, compile_and_link: $$@)
105105
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(2)),$$(notdir $$@))
106+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_RGLOB_$(2)),$$(notdir $$@))
106107
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) $(BORROWCK) --out-dir $$(@D) $$< && touch $$@
107108
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_GLOB_$(2)),$$(notdir $$@))
109+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBSYNTAX_RGLOB_$(2)),$$(notdir $$@))
108110

109111
# Only build the compiler for host triples
110112
ifneq ($$(findstring $(2),$$(CFG_HOST)),)
@@ -119,14 +121,19 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
119121
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): CFG_COMPILER = $(2)
120122
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
121123
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
124+
$(S)src/librustc/lib/llvmdeps.rs \
122125
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
123126
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)) \
124127
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
125128
| $$(TLIB$(1)_T_$(2)_H_$(3))/
126129
@$$(call E, compile_and_link: $$@)
127130
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@))
128-
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
131+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_RGLOB_$(2)),$$(notdir $$@))
132+
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) \
133+
-L "$$(LLVM_LIBDIR_$(2))" \
134+
--out-dir $$(@D) $$< && touch $$@
129135
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@))
136+
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_RGLOB_$(2)),$$(notdir $$@))
130137

131138
# NOTE: after the next snapshot remove these '-L' flags
132139
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \

‎branches/auto/mk/tests.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,8 @@ $(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): \
376376
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM_$(2)) \
377377
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2))
378378
@$$(call E, compile_and_link: $$@)
379-
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
379+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
380+
-L "$$(LLVM_LIBDIR_$(2))"
380381

381382
$(3)/stage$(1)/test/rustpkgtest-$(2)$$(X_$(2)): \
382383
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \

‎branches/auto/src/compiletest/compiletest.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,6 @@ pub fn opt_str2(maybestr: Option<~str>) -> ~str {
192192
match maybestr { None => ~"(none)", Some(s) => { s } }
193193
}
194194

195-
pub fn str_opt(maybestr: ~str) -> Option<~str> {
196-
if maybestr != ~"(none)" { Some(maybestr) } else { None }
197-
}
198-
199195
pub fn str_mode(s: ~str) -> mode {
200196
match s {
201197
~"compile-fail" => mode_compile_fail,

‎branches/auto/src/compiletest/runtest.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use header::TestProps;
1818
use header::load_props;
1919
use procsrv;
2020
use util::logv;
21+
#[cfg(target_os = "win32")]
2122
use util;
2223

2324
use std::io::File;
@@ -482,6 +483,7 @@ fn check_expected_errors(expected_errors: ~[errors::ExpectedError],
482483
format!("{}:{}:", testfile.display(), ee.line)
483484
}).collect::<~[~str]>();
484485

486+
#[cfg(target_os = "win32")]
485487
fn to_lower( s : &str ) -> ~str {
486488
let i = s.chars();
487489
let c : ~[char] = i.map( |c| {
@@ -822,6 +824,7 @@ fn make_cmdline(libpath: &str, prog: &str, args: &[~str]) -> ~str {
822824

823825
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
824826
// for diagnostic purposes
827+
#[cfg(target_os = "win32")]
825828
fn lib_path_cmd_prefix(path: &str) -> ~str {
826829
format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
827830
}

‎branches/auto/src/compiletest/util.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
use common::config;
1212

13+
#[cfg(target_os = "win32")]
1314
use std::os::getenv;
1415

1516
/// Conversion table from triple OS name to Rust SYSNAME
@@ -31,6 +32,7 @@ pub fn get_os(triple: &str) -> &'static str {
3132
fail!("Cannot determine OS from triple");
3233
}
3334

35+
#[cfg(target_os = "win32")]
3436
pub fn make_new_path(path: &str) -> ~str {
3537

3638
// Windows just uses PATH as the library search path, so we have to
@@ -43,21 +45,9 @@ pub fn make_new_path(path: &str) -> ~str {
4345
}
4446
}
4547

46-
#[cfg(target_os = "linux")]
47-
#[cfg(target_os = "freebsd")]
48-
pub fn lib_path_env_var() -> ~str { ~"LD_LIBRARY_PATH" }
49-
50-
#[cfg(target_os = "macos")]
51-
pub fn lib_path_env_var() -> ~str { ~"DYLD_LIBRARY_PATH" }
52-
5348
#[cfg(target_os = "win32")]
5449
pub fn lib_path_env_var() -> ~str { ~"PATH" }
5550

56-
#[cfg(target_os = "linux")]
57-
#[cfg(target_os = "macos")]
58-
#[cfg(target_os = "freebsd")]
59-
pub fn path_div() -> ~str { ~":" }
60-
6151
#[cfg(target_os = "win32")]
6252
pub fn path_div() -> ~str { ~";" }
6353

0 commit comments

Comments
 (0)