Skip to content

Commit c8c44dc

Browse files
KimundiKimundi
committed
---
yaml --- r: 92131 b: refs/heads/auto c: 142eb68 h: refs/heads/master i: 92129: 8e78e3e 92127: f6848dc v: v3
1 parent 947250d commit c8c44dc

File tree

24 files changed

+114
-253
lines changed

24 files changed

+114
-253
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: 820271df1c3d7899460c0fa25c1a7cf74d45d431
16+
refs/heads/auto: 142eb685f913e15494bfab9ec142e40f6bf92cc4
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/.gitignore

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

‎branches/auto/Makefile.in

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,10 @@ 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)
142137
RUSTFLAGS_STAGE0 += -Z prefer-dynamic
143138
RUSTFLAGS_STAGE1 += -Z prefer-dynamic
139+
RUSTFLAGS_STAGE2 += -Z prefer-dynamic
140+
RUSTFLAGS_STAGE3 += -Z prefer-dynamic
144141

145142
# platform-specific auto-configuration
146143
include $(CFG_SRC_DIR)mk/platform.mk
@@ -227,7 +224,7 @@ GENERATED :=
227224
define DEF_LIBS
228225

229226
CFG_RUNTIME_$(1) :=$(call CFG_STATIC_LIB_NAME_$(1),rustrt)
230-
CFG_RUSTLLVM_$(1) :=$(call CFG_STATIC_LIB_NAME_$(1),rustllvm)
227+
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
231228
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
232229
CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
233230
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
@@ -254,8 +251,6 @@ LIBRUSTUV_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustuv)
254251
EXTRALIB_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,extra)
255252
STDLIB_RGLOB_$(1) :=$(call CFG_RLIB_GLOB,std)
256253
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)
259254

260255
endef
261256

@@ -433,6 +428,8 @@ TLIBRUSTUV_DEFAULT$(1)_T_$(2)_H_$(3) = \
433428
# Preqrequisites for using the stageN compiler
434429
HSREQ$(1)_H_$(3) = \
435430
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
431+
$$(HLIB$(1)_H_$(3))/$(CFG_RUNTIME_$(3)) \
432+
$$(HLIB$(1)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
436433
$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
437434
$$(HEXTRALIB_DEFAULT$(1)_H_$(3)) \
438435
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \

‎branches/auto/mk/clean.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ 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))
136135
$(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))
138136
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
139137
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
140138
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))

‎branches/auto/mk/host.mk

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,21 @@ 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)) \
2930
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
3031
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
3132
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
3233
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
33-
$$(HLIBRUSTC_DEFAULT$(2)_H_$(4)) \
34-
$$(HLIBSYNTAX_DEFAULT$(2)_H_$(4)) \
3534
| $$(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)) \
4344
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
4445
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
4546
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
@@ -56,6 +57,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
5657
$$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
5758
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBSYNTAX_$(4)) \
5859
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
60+
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
5961
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
6062
$$(HEXTRALIB_DEFAULT$(2)_H_$(4)) \
6163
$$(HLIBRUSTUV_DEFAULT$(2)_H_$(4)) \
@@ -128,6 +130,12 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTUV_$(4)): \
128130
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_GLOB_$(4)),$$(notdir $$@))
129131
$$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTUV_RGLOB_$(4)),$$(notdir $$@))
130132

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+
131139
$$(HBIN$(2)_H_$(4))/:
132140
mkdir -p $$@
133141

‎branches/auto/mk/install.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ 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)))
106107
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_GLOB_$(1)))
107108
$$(Q)$$(call INSTALL_LIB,$$(STDLIB_RGLOB_$(1)))
108109
$$(Q)$$(call INSTALL_LIB,$$(EXTRALIB_GLOB_$(1)))
@@ -153,6 +154,7 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_)_H_$(CFG_BUILD_))
153154
$(Q)$(call INSTALL_LIB,$(LIBSYNTAX_GLOB_$(CFG_BUILD)))
154155
$(Q)$(call INSTALL_LIB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD)))
155156
$(Q)$(call INSTALL_LIB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD)))
157+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM_$(CFG_BUILD)))
156158
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustc.1)
157159
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustdoc.1)
158160
$(Q)$(call INSTALL,$(S)/man,$(CFG_MANDIR)/man1,rustpkg.1)
@@ -167,6 +169,7 @@ uninstall:
167169
$(Q)rm -f $(PHB)/rustc$(X_$(CFG_BUILD))
168170
$(Q)rm -f $(PHB)/rustpkg$(X_$(CFG_BUILD))
169171
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD))
172+
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD))
170173
$(Q)for i in \
171174
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB_$(CFG_BUILD))) \
172175
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_RGLOB_$(CFG_BUILD))) \

‎branches/auto/mk/llvm.mk

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,5 @@ $$(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-
5747
$(foreach host,$(CFG_HOST), \
5848
$(eval $(call DEF_LLVM_RULES,$(host))))

‎branches/auto/mk/rustllvm.mk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ 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))
35+
$(1)/rustllvm/$(CFG_RUSTLLVM_$(1)): $$(RUSTLLVM_OBJS_OBJS_$(1)) \
36+
$$(MKFILE_DEPS) $$(RUSTLLVM_DEF_$(1))
3637
@$$(call E, link: $$@)
37-
$$(Q)$$(AR_$(1)) rcs $$@ $$(RUSTLLVM_OBJS_OBJS_$(1))
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)))
3842

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

‎branches/auto/mk/stage0.mk

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ endif
2727

2828
# Host libs will be extracted by the above rule
2929

30-
# NOTE: remove all these after the next snapshot
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+
3135
$(HLIB0_H_$(CFG_BUILD))/$(CFG_STDLIB_$(CFG_BUILD)): \
3236
$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD)) \
3337
| $(HLIB0_H_$(CFG_BUILD))/
@@ -72,7 +76,12 @@ $$(HBIN0_H_$(1))/rustc$$(X_$(1)): \
7276
@$$(call E, cp: $$@)
7377
$$(Q)cp $$< $$@
7478

75-
# NOTE: removing everything below after the next snapshot
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+
7685
$$(HLIB0_H_$(1))/$(CFG_STDLIB_$(1)): \
7786
$$(TLIB$(2)_T_$(1)_H_$(3))/$(CFG_STDLIB_$(1)) \
7887
| $(HLIB0_H_$(1))/

‎branches/auto/mk/target.mk

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,8 @@ $$(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 $$@))
107106
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) $(BORROWCK) --out-dir $$(@D) $$< && touch $$@
108107
$$(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 $$@))
110108

111109
# Only build the compiler for host triples
112110
ifneq ($$(findstring $(2),$$(CFG_HOST)),)
@@ -121,19 +119,14 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
121119
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): CFG_COMPILER = $(2)
122120
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
123121
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
124-
$(S)src/librustc/lib/llvmdeps.rs \
125122
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
126123
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)) \
127124
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
128125
| $$(TLIB$(1)_T_$(2)_H_$(3))/
129126
@$$(call E, compile_and_link: $$@)
130127
$$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTC_GLOB_$(2)),$$(notdir $$@))
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_$(3))" \
134-
--out-dir $$(@D) $$< && touch $$@
128+
$$(STAGE$(1)_T_$(2)_H_$(3)) $$(WFLAGS_ST$(1)) --out-dir $$(@D) $$< && touch $$@
135129
$$(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 $$@))
137130

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

‎branches/auto/mk/tests.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,7 @@ $(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 \
380-
-L "$$(LLVM_LIBDIR_$(3))"
379+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
381380

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

‎branches/auto/src/etc/mklldeps.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎branches/auto/src/etc/snapshot.py

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,34 @@ def scrub(b):
2525
download_unpack_base = os.path.join(download_dir_base, "unpack")
2626

2727
snapshot_files = {
28-
"linux": ["bin/rustc"],
29-
"macos": ["bin/rustc"],
30-
"winnt": ["bin/rustc.exe"],
31-
"freebsd": ["bin/rustc"],
28+
"linux": ["bin/rustc",
29+
"lib/libstd-*.so",
30+
"lib/libextra-*.so",
31+
"lib/librustc-*.so",
32+
"lib/libsyntax-*.so",
33+
"lib/librustuv-*.so",
34+
"lib/librustllvm.so"],
35+
"macos": ["bin/rustc",
36+
"lib/libstd-*.dylib",
37+
"lib/libextra-*.dylib",
38+
"lib/librustc-*.dylib",
39+
"lib/libsyntax-*.dylib",
40+
"lib/librustuv-*.dylib",
41+
"lib/librustllvm.dylib"],
42+
"winnt": ["bin/rustc.exe",
43+
"bin/std-*.dll",
44+
"bin/extra-*.dll",
45+
"bin/rustc-*.dll",
46+
"bin/syntax-*.dll",
47+
"bin/rustuv-*.dll",
48+
"bin/rustllvm.dll"],
49+
"freebsd": ["bin/rustc",
50+
"lib/libstd-*.so",
51+
"lib/libextra-*.so",
52+
"lib/librustc-*.so",
53+
"lib/libsyntax-*.so",
54+
"lib/librustuv-*.so",
55+
"lib/librustllvm.so"]
3256
}
3357

3458
winnt_runtime_deps = ["libgcc_s_dw2-1.dll",

‎branches/auto/src/librustc/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#[comment = "The Rust compiler"];
1818
#[license = "MIT/ASL2"];
1919
#[crate_type = "dylib"];
20-
#[crate_type = "rlib"];
2120

2221
#[feature(macro_rules, globs, struct_variant, managed_boxes)];
2322

@@ -111,7 +110,6 @@ pub mod util {
111110

112111
pub mod lib {
113112
pub mod llvm;
114-
pub mod llvmdeps;
115113
}
116114

117115
// A curious inner module that allows ::std::foo to be available in here for

‎branches/auto/src/librustc/lib/llvm.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -306,18 +306,7 @@ pub mod llvm {
306306
use std::libc::{c_char, c_int, c_longlong, c_ushort, c_uint, c_ulonglong,
307307
size_t};
308308

309-
// Link to our native llvm bindings (things that we need to use the C++ api
310-
// for) and because llvm is written in C++ we need to link against libstdc++
311-
//
312-
// You'll probably notice that there is an omission of all LLVM libraries
313-
// from this location. This is because the set of LLVM libraries that we
314-
// link to is mostly defined by LLVM, and the `llvm-config` tool is used to
315-
// figure out the exact set of libraries. To do this, the build system
316-
// generates an llvmdeps.rs file next to this one which will be
317-
// automatically updated whenever LLVM is updated to include an up-to-date
318-
// set of the libraries we need to link to LLVM for.
319-
#[link(name = "rustllvm", kind = "static")]
320-
#[link(name = "stdc++")]
309+
#[link(name = "rustllvm")]
321310
extern {
322311
/* Create and destroy contexts. */
323312
pub fn LLVMContextCreate() -> ContextRef;

‎branches/auto/src/librustpkg/tests.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,6 @@ fn no_rebuilding() {
11011101
}
11021102
11031103
#[test]
1104-
#[ignore]
11051104
fn no_recopying() {
11061105
let p_id = PkgId::new("foo");
11071106
let workspace = create_local_package(&p_id);
@@ -1823,7 +1822,7 @@ fn test_linker_build() {
18231822
let workspace = workspace.path();
18241823
let matches = getopts([], optgroups());
18251824
let options = build_session_options(@"rustpkg",
1826-
matches.get_ref(),
1825+
matches.as_ref().unwrap(),
18271826
@diagnostic::DefaultEmitter as
18281827
@diagnostic::Emitter);
18291828
let sess = build_session(options,

‎branches/auto/src/libstd/any.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ mod tests {
151151
use super::*;
152152
use super::AnyRefExt;
153153
use option::{Some, None};
154-
use hash::Hash;
155154

156155
#[deriving(Eq)]
157156
struct Test;

0 commit comments

Comments
 (0)