about summary refs log tree commit diff
diff options
context:
space:
mode:
authorIlyong Cho <ilyoan@gmail.com>2013-08-30 14:05:57 +0900
committerIlyong Cho <ilyoan@gmail.com>2013-09-02 11:55:54 +0900
commitcbd143f966ad7df855da95ad901513b82d1993c9 (patch)
tree31b3963e5dc1b973c9f5e6f6b631f97bdd99a677
parent73a28e595c2aacf38c12a56807547e7cda6839ee (diff)
downloadrust-cbd143f966ad7df855da95ad901513b82d1993c9.tar.gz
rust-cbd143f966ad7df855da95ad901513b82d1993c9.zip
turn off android ndk asm pass
-rw-r--r--src/librustc/driver/driver.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index e4d3ca4baef..e381b0af47a 100644
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -337,9 +337,7 @@ pub fn phase_5_run_llvm_passes(sess: Session,
     // segmented stacks are enabled.  However, unwind info directives in assembly
     // output are OK, so we generate assembly first and then run it through
     // an external assembler.
-    // Same for Android.
-    if (sess.targ_cfg.os == session::OsAndroid ||
-        sess.targ_cfg.os == session::OsWin32) &&
+    if sess.targ_cfg.os == session::OsWin32 &&
         (sess.opts.output_type == link::output_type_object ||
          sess.opts.output_type == link::output_type_exe) {
         let output_type = link::output_type_assembly;