Skip to content

Commit

Permalink
auto merge of #13569 : alexcrichton/rust/ignore-bytecode, r=brson
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
bors committed Apr 17, 2014
2 parents 1fd7de8 + 6807eab commit 903fbd2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc/back/archive.rs
Original file line number Diff line number Diff line change
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

0 comments on commit 903fbd2

Please sign in to comment.