Skip to content

Commit

Permalink
Revert "Embed Windows application manifest."
Browse files Browse the repository at this point in the history
  • Loading branch information
vadimcn committed Dec 30, 2013
1 parent 1502b11 commit 8562229
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 133 deletions.
7 changes: 0 additions & 7 deletions src/librustc/back/link.rs
Expand Up @@ -11,7 +11,6 @@

use back::archive::{Archive, METADATA_FILENAME};
use back::rpath;
use back::manifest;
use driver::driver::CrateTranslation;
use driver::session::Session;
use driver::session;
Expand Down Expand Up @@ -828,12 +827,6 @@ fn link_binary_output(sess: Session,
}
session::OutputExecutable => {
link_natively(sess, false, obj_filename, &out_filename);
// Windows linker will add an ".exe" extension if there was none
let out_filename = match out_filename.extension() {
Some(_) => out_filename.clone(),
None => out_filename.with_extension(win32::EXE_EXTENSION)
};
manifest::postprocess_executable(sess, &out_filename);
}
session::OutputDylib => {
link_natively(sess, true, obj_filename, &out_filename);
Expand Down
106 changes: 0 additions & 106 deletions src/librustc/back/manifest.rs

This file was deleted.

1 change: 0 additions & 1 deletion src/librustc/lib.rs
Expand Up @@ -88,7 +88,6 @@ pub mod front {
pub mod back {
pub mod archive;
pub mod link;
pub mod manifest;
pub mod abi;
pub mod arm;
pub mod mips;
Expand Down
19 changes: 0 additions & 19 deletions src/test/run-pass/setup.rs

This file was deleted.

9 comments on commit 8562229

@bors
Copy link
Contributor

@bors bors commented on 8562229 Dec 31, 2013

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at vadimcn@8562229

@bors
Copy link
Contributor

@bors bors commented on 8562229 Dec 31, 2013

Choose a reason for hiding this comment

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

merging vadimcn/rust/revert-manifest = 8562229 into auto

@bors
Copy link
Contributor

@bors bors commented on 8562229 Dec 31, 2013

Choose a reason for hiding this comment

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

vadimcn/rust/revert-manifest = 8562229 merged ok, testing candidate = b9a566a2

@bors
Copy link
Contributor

@bors bors commented on 8562229 Dec 31, 2013

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at vadimcn@8562229

@bors
Copy link
Contributor

@bors bors commented on 8562229 Dec 31, 2013

Choose a reason for hiding this comment

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

merging vadimcn/rust/revert-manifest = 8562229 into auto

@bors
Copy link
Contributor

@bors bors commented on 8562229 Dec 31, 2013

Choose a reason for hiding this comment

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

vadimcn/rust/revert-manifest = 8562229 merged ok, testing candidate = a1d3cc5

@bors
Copy link
Contributor

@bors bors commented on 8562229 Dec 31, 2013

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 8562229 Dec 31, 2013

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 = a1d3cc5

Please sign in to comment.