Skip to content

Commit

Permalink
rustc: Fix omission of bytecode in staticlibs
Browse files Browse the repository at this point in the history
The name of the file changed awhile back and this spot wasn't updated to
continue ignoring the bytecode from rlibs when copying into staticlibs.
  • Loading branch information
alexcrichton committed Apr 17, 2014
1 parent 12391df commit 6807eab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc/back/archive.rs
Expand Up @@ -104,7 +104,7 @@ impl<'a> Archive<'a> {
pub fn add_rlib(&mut self, rlib: &Path, name: &str,
lto: bool) -> io::IoResult<()> {
let object = format!("{}.o", name);
let bytecode = format!("{}.bc", name);
let bytecode = format!("{}.bc.deflate", name);
let mut ignore = vec!(METADATA_FILENAME, bytecode.as_slice());
if lto {
ignore.push(object.as_slice());
Expand Down

5 comments on commit 6807eab

@bors
Copy link
Contributor

@bors bors commented on 6807eab Apr 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at alexcrichton@6807eab

@bors
Copy link
Contributor

@bors bors commented on 6807eab Apr 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/ignore-bytecode = 6807eab into auto

@bors
Copy link
Contributor

@bors bors commented on 6807eab Apr 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/ignore-bytecode = 6807eab merged ok, testing candidate = 903fbd2

@bors
Copy link
Contributor

@bors bors commented on 6807eab Apr 17, 2014

@bors
Copy link
Contributor

@bors bors commented on 6807eab Apr 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 903fbd2

Please sign in to comment.