---

yaml
---
r: 6277
b: refs/heads/master
c: dd5512c
h: refs/heads/master
i:
  6275: 2da7622
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47d875e00270d227a29d53e54ef6d1561608fbab
+refs/heads/master: dd5512ccb0ab15e695147d1060cba1d5171adffb

trunk/src/comp/driver/rustc.rs

@@ -28,9 +28,15 @@ fn default_configuration(sess: session::session, argv0: str, input: str) ->
 
     let mk = attr::mk_name_value_item_str;
 
+    let arch = alt sess.get_targ_cfg().arch {
+      session::arch_x86. { "x86" }
+      session::arch_x86_64. { "x86_64" }
+      session::arch_arm. { "arm" }
+    };
+
     ret [ // Target bindings.
          mk("target_os", std::os::target_os()),
-         mk("target_arch", "x86"),
+         mk("target_arch", arch),
          mk("target_libc", libc),
          // Build bindings.
          mk("build_compiler", argv0),

trunk/src/test/run-pass/conditional-compile-arch.rs

@@ -0,0 +1,5 @@
+#[cfg(target_arch = "x86")]
+fn main() { }
+
+#[cfg(target_arch = "x86_64")]
+fn main() { }