summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-09-01 17:37:20 -0700
committerBrian Anderson <banderson@mozilla.com>2011-09-01 17:49:39 -0700
commitfc45eb785ad00de59a3cb26225d30f0fbc72b1c0 (patch)
treef743fe2f463816a7ff63d628be03d124e0eefc6d /src
parent786963d33d4b267713dd6a61ed2bfa7dab90919b (diff)
downloadrust-fc45eb785ad00de59a3cb26225d30f0fbc72b1c0.tar.gz
rust-fc45eb785ad00de59a3cb26225d30f0fbc72b1c0.zip
Use #env to get the rustc version again. Issue #855
Diffstat (limited to 'src')
-rw-r--r--src/comp/driver/rustc.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 3ae222369dc..78d17282724 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -257,9 +257,7 @@ fn pretty_print_input(sess: session::session, cfg: ast::crate_cfg,
 
 fn version(argv0: &istr) {
     let vers = ~"unknown version";
-    // FIXME: Restore after istr conversion
-    //let env_vers = #env["CFG_VERSION"];
-    let env_vers = ~"FIXME";
+    let env_vers = #env["CFG_VERSION"];
     if str::byte_len(env_vers) != 0u { vers = env_vers; }
     io::stdout().write_str(
         #ifmt["%s %s\n",