about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYoung-il Choi <duddlf.choi@samsung.com>2013-03-13 09:21:12 +0900
committerYoung-il Choi <duddlf.choi@samsung.com>2013-03-13 09:21:12 +0900
commit268faef63adc5d52c9bdfbb6e8b44a307f4528d8 (patch)
tree0a8d428ef72a2fdfd5c6a4f471d164ad0953b3df /src
parentb60c3bfa4a95fecae2f28929f22f38865d7e5f79 (diff)
downloadrust-268faef63adc5d52c9bdfbb6e8b44a307f4528d8.tar.gz
rust-268faef63adc5d52c9bdfbb6e8b44a307f4528d8.zip
mk: target triple rename arm-unknown-android->arm-linux-androideabi
Diffstat (limited to 'src')
-rw-r--r--src/librustc/back/arm.rs2
-rw-r--r--src/librustc/driver/driver.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/back/arm.rs b/src/librustc/back/arm.rs
index 95337b4150c..97c3a588a7f 100644
--- a/src/librustc/back/arm.rs
+++ b/src/librustc/back/arm.rs
@@ -65,7 +65,7 @@ pub fn get_target_strs(target_os: session::os) -> target_strs::t {
           session::os_macos => ~"arm-apple-darwin",
           session::os_win32 => ~"arm-pc-mingw32",
           session::os_linux => ~"arm-unknown-linux",
-          session::os_android => ~"arm-unknown-android",
+          session::os_android => ~"arm-linux-androideabi",
           session::os_freebsd => ~"arm-unknown-freebsd"
         },
 
diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index 2b61c948045..ce587e042c3 100644
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -446,10 +446,10 @@ pub fn get_os(triple: ~str) -> Option<session::os> {
             Some(session::os_win32)
         } else if str::contains(triple, ~"darwin") {
             Some(session::os_macos)
-        } else if str::contains(triple, ~"linux") {
-            Some(session::os_linux)
         } else if str::contains(triple, ~"android") {
             Some(session::os_android)
+        } else if str::contains(triple, ~"linux") {
+            Some(session::os_linux)
         } else if str::contains(triple, ~"freebsd") {
             Some(session::os_freebsd)
         } else { None }