diff options
| author | bors <bors@rust-lang.org> | 2014-01-07 04:41:39 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-07 04:41:39 -0800 |
| commit | ba6ed004b0a7bf40dbd906ba9c8677133213c6ef (patch) | |
| tree | 328cb5d2960f11a655f231137d1bf7e92f60afd5 /src | |
| parent | bc395bc71e02a7726565725ce026758f948b2d76 (diff) | |
| parent | b7e58ce5547805490a60a108b1c5ce8813eb93e9 (diff) | |
| download | rust-ba6ed004b0a7bf40dbd906ba9c8677133213c6ef.tar.gz rust-ba6ed004b0a7bf40dbd906ba9c8677133213c6ef.zip | |
auto merge of #11347 : alexcrichton/rust/issue-11346, r=brson
This ends up causing weird errors like those seen in #11346 Closes #11346
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/driver/session.rs | 4 | ||||
| -rw-r--r-- | src/test/run-make/duplicate-output-flavors/Makefile | 4 | ||||
| -rw-r--r-- | src/test/run-make/duplicate-output-flavors/foo.rs | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs index 4295d14441e..a8a948db4e1 100644 --- a/src/librustc/driver/session.rs +++ b/src/librustc/driver/session.rs @@ -192,7 +192,7 @@ pub enum EntryFnType { EntryNone, } -#[deriving(Eq, Clone)] +#[deriving(Eq, Clone, TotalOrd, TotalEq)] pub enum OutputStyle { OutputExecutable, OutputDylib, @@ -461,6 +461,8 @@ pub fn collect_outputs(session: &Session, if base.len() == 0 { base.push(OutputExecutable); } + base.sort(); + base.dedup(); return base; } diff --git a/src/test/run-make/duplicate-output-flavors/Makefile b/src/test/run-make/duplicate-output-flavors/Makefile new file mode 100644 index 00000000000..a93a7ce8448 --- /dev/null +++ b/src/test/run-make/duplicate-output-flavors/Makefile @@ -0,0 +1,4 @@ +include ../tools.mk + +all: + $(RUSTC) --rlib foo.rs diff --git a/src/test/run-make/duplicate-output-flavors/foo.rs b/src/test/run-make/duplicate-output-flavors/foo.rs new file mode 100644 index 00000000000..3cdacc96ee9 --- /dev/null +++ b/src/test/run-make/duplicate-output-flavors/foo.rs @@ -0,0 +1 @@ +#[crate_type = "rlib"]; |