about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-06-06 22:00:42 -0700
committerBrian Anderson <banderson@mozilla.com>2012-06-06 23:39:09 -0700
commit469ff08e646d4f56403a8d6dbd97d146bd8eeefb (patch)
tree99773b8b9176e158b76bedbbf01582d973a8350f
parenteed3a36511253631bdde68e8e2ba5994b1644995 (diff)
downloadrust-469ff08e646d4f56403a8d6dbd97d146bd8eeefb.tar.gz
rust-469ff08e646d4f56403a8d6dbd97d146bd8eeefb.zip
rustc: Enable #[cfg(windows)] and #[cfg(unix)]
-rw-r--r--src/rustc/driver/driver.rs1
-rw-r--r--src/test/run-pass/cfg-family.rs7
2 files changed, 8 insertions, 0 deletions
diff --git a/src/rustc/driver/driver.rs b/src/rustc/driver/driver.rs
index 1abc36a075f..672a950f42b 100644
--- a/src/rustc/driver/driver.rs
+++ b/src/rustc/driver/driver.rs
@@ -49,6 +49,7 @@ fn default_configuration(sess: session, argv0: str, input: input) ->
     };
 
     ret [ // Target bindings.
+         attr::mk_word_item(os::family()),
          mk("target_os", os::sysname()),
          mk("target_family", os::family()),
          mk("target_arch", arch),
diff --git a/src/test/run-pass/cfg-family.rs b/src/test/run-pass/cfg-family.rs
new file mode 100644
index 00000000000..35eae3c604d
--- /dev/null
+++ b/src/test/run-pass/cfg-family.rs
@@ -0,0 +1,7 @@
+#[cfg(windows)]
+fn main() {
+}
+
+#[cfg(unix)]
+fn main() {
+}
\ No newline at end of file