Bug 1266792 - Target armv7 android. r=kinetik,snorp
authorRalph Giles <giles@mozilla.com>
Thu, 27 Oct 2016 12:19:59 -0700
changeset 347445 96412ec21495ad1be9965eb64b7263466446b4c4
parent 347444 872ebe45f2f6a650a22097348c99c5c268343406
child 347446 5041f62a54160e47380606215b95c36d073f995a
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskinetik, snorp
Bug 1266792 - Target armv7 android. r=kinetik,snorp We actually target armv7, so we need this distinct triple with the rust toolchain, while it's implicit with the android ndk. MozReview-Commit-ID: LUwdpOaWB6M
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -109,17 +109,17 @@ def rust_target(rust_compiler, rustc, ta
             # Linux
             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
             # OS X and iOS
             ('x86', 'OSX'): 'i686-apple-darwin',
             ('x86', 'iOS'): 'i386-apple-ios',
             ('x86_64', 'OSX'): 'x86_64-apple-darwin',
             # Android
             ('x86', 'Android'): 'i686-linux-android',
-            ('arm', 'Android'): 'arm-linux-androideabi',
+            ('arm', 'Android'): 'armv7-linux-androideabi',
             # Windows
             # XXX better detection of CXX needed here, to figure out whether
             # we need i686-pc-windows-gnu instead, since mingw32 builds work.
             ('x86', 'WINNT'): 'i686-pc-windows-msvc',
             ('x86_64', 'WINNT'): 'x86_64-pc-windows-msvc',
         }.get((target.cpu, os_or_kernel), None)
         if rustc_target is None: