diff options
| -rw-r--r-- | src/librustc/driver/session.rs | 5 | ||||
| -rw-r--r-- | src/librustc/middle/trans/base.rs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs index 57edb355d32..d08127501b4 100644 --- a/src/librustc/driver/session.rs +++ b/src/librustc/driver/session.rs @@ -76,6 +76,7 @@ pub static no_vectorize_loops: uint = 1 << 26; pub static no_vectorize_slp: uint = 1 << 27; pub static no_prepopulate_passes: uint = 1 << 28; pub static use_softfp: uint = 1 << 29; +pub static gen_crate_map: uint = 1 << 30; pub fn debugging_opts_map() -> ~[(&'static str, &'static str, uint)] { ~[("verbose", "in general, enable more debug printouts", verbose), @@ -128,6 +129,7 @@ pub fn debugging_opts_map() -> ~[(&'static str, &'static str, uint)] { "Don't run LLVM's SLP vectorization passes", no_vectorize_slp), ("soft-float", "Generate software floating point library calls", use_softfp), + ("gen-crate-map", "Force generation of a toplevel crate map", gen_crate_map), ] } @@ -331,6 +333,9 @@ impl Session_ { pub fn no_vectorize_slp(&self) -> bool { self.debugging_opt(no_vectorize_slp) } + pub fn gen_crate_map(&self) -> bool { + self.debugging_opt(gen_crate_map) + } // pointless function, now... pub fn str_of(&self, id: ast::Ident) -> @str { diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index c6b663634f3..a6e71b22bf5 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -2949,7 +2949,7 @@ pub fn decl_crate_map(sess: session::Session, mapmeta: LinkMeta, let mut n_subcrates = 1; let cstore = sess.cstore; while cstore::have_crate_data(cstore, n_subcrates) { n_subcrates += 1; } - let mapname = if *sess.building_library { + let mapname = if *sess.building_library && !sess.gen_crate_map() { format!("{}_{}_{}", mapmeta.name, mapmeta.vers, mapmeta.extras_hash) } else { ~"toplevel" |