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. :-(
rust-lang · Dec 31, 2013 · a1d3cc5 · a1d3cc5
2 parents df25bb6 + 8562229
commit a1d3cc5
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 133 deletions.
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
@@ -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;
@@ -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);

diff --git a/src/librustc/back/manifest.rs b/src/librustc/back/manifest.rs
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
@@ -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;

diff --git a/src/test/run-pass/setup.rs b/src/test/run-pass/setup.rs