auto merge of #8362 : sfackler/rust/env, r=alexcrichton

env! aborts compilation of the specified environment variable is not
defined and takes an optional second argument containing a custom
error message. option_env! creates an Option<&'static str> containing
the value of the environment variable.

There are no run-pass tests that check the behavior when the environment
variable is defined since the test framework doesn't support setting
environment variables at compile time as opposed to runtime. However,
both env! and option_env! are used inside of rustc itself, which should
act as a sufficient test.

Fixes #2248.

diff --cc src/librustc/driver/driver.rs
Simple merge

diff --cc src/librustc/middle/resolve.rs
Simple merge

diff --cc src/librustc/rustc.rs
Simple merge

diff --cc src/libsyntax/ext/base.rs
Simple merge