Skip to content

Commit a1d3cc5

Browse files
committed
auto merge of #11221 : vadimcn/rust/revert-manifest, r=alexcrichton
In view of the problems outlined in #11207, I think manifest embedding should be removed, until we find a better solution. :-(
2 parents df25bb6 + 8562229 commit a1d3cc5

File tree

4 files changed

+0
-133
lines changed

4 files changed

+0
-133
lines changed

src/librustc/back/link.rs

-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
use back::archive::{Archive, METADATA_FILENAME};
1313
use back::rpath;
14-
use back::manifest;
1514
use driver::driver::CrateTranslation;
1615
use driver::session::Session;
1716
use driver::session;
@@ -828,12 +827,6 @@ fn link_binary_output(sess: Session,
828827
}
829828
session::OutputExecutable => {
830829
link_natively(sess, false, obj_filename, &out_filename);
831-
// Windows linker will add an ".exe" extension if there was none
832-
let out_filename = match out_filename.extension() {
833-
Some(_) => out_filename.clone(),
834-
None => out_filename.with_extension(win32::EXE_EXTENSION)
835-
};
836-
manifest::postprocess_executable(sess, &out_filename);
837830
}
838831
session::OutputDylib => {
839832
link_natively(sess, true, obj_filename, &out_filename);

src/librustc/back/manifest.rs

-106
This file was deleted.

src/librustc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ pub mod front {
8888
pub mod back {
8989
pub mod archive;
9090
pub mod link;
91-
pub mod manifest;
9291
pub mod abi;
9392
pub mod arm;
9493
pub mod mips;

src/test/run-pass/setup.rs

-19
This file was deleted.

0 commit comments

Comments
 (0)