Skip to content

Commit ba6ed00

Browse files
committed
auto merge of #11347 : alexcrichton/rust/issue-11346, r=brson
This ends up causing weird errors like those seen in #11346 Closes #11346
2 parents bc395bc + b7e58ce commit ba6ed00

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/librustc/driver/session.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ pub enum EntryFnType {
192192
EntryNone,
193193
}
194194

195-
#[deriving(Eq, Clone)]
195+
#[deriving(Eq, Clone, TotalOrd, TotalEq)]
196196
pub enum OutputStyle {
197197
OutputExecutable,
198198
OutputDylib,
@@ -461,6 +461,8 @@ pub fn collect_outputs(session: &Session,
461461
if base.len() == 0 {
462462
base.push(OutputExecutable);
463463
}
464+
base.sort();
465+
base.dedup();
464466
return base;
465467
}
466468

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include ../tools.mk
2+
3+
all:
4+
$(RUSTC) --rlib foo.rs
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#[crate_type = "rlib"];

0 commit comments

Comments
 (0)