auto merge of #13569 : alexcrichton/rust/ignore-bytecode, r=brson

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.
This commit is contained in:
bors 2014-04-17 06:16:24 -07:00
commit 903fbd2635

View File

@ -104,7 +104,7 @@ impl<'a> Archive<'a> {
pub fn add_rlib(&mut self, rlib: &Path, name: &str, pub fn add_rlib(&mut self, rlib: &Path, name: &str,
lto: bool) -> io::IoResult<()> { lto: bool) -> io::IoResult<()> {
let object = format!("{}.o", name); 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()); let mut ignore = vec!(METADATA_FILENAME, bytecode.as_slice());
if lto { if lto {
ignore.push(object.as_slice()); ignore.push(object.as_slice());