Bug 1299864 - Target i585 linux when building rust code. r=glandium
authorRalph Giles <giles@mozilla.com>
Tue, 06 Sep 2016 13:46:03 -0700
changeset 313077 f89db30c48bf6b0d1078dd56f56b9003cafe94d1
parent 313076 1b808c63a394eabe5251b3849332d39bb57e753a
child 313078 e68e09a4334c47b5a54949143f9716038c738562
push id20479
push userkwierso@gmail.com
push dateThu, 08 Sep 2016 01:08:46 +0000
treeherderfx-team@fb7c6b034329 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1299864
milestone51.0a1
Bug 1299864 - Target i585 linux when building rust code. r=glandium Update linux32 tooltool manifest to use a gecko build of rustc and cargo for x86_64-unknown-linux-gnu host targeting both x86_64 and i586. rustc built with --enable-llvm-static-stdcpp --disable-docs --enable-debuginfo --release-channel=stable from 'stable' branch rust 1.11.0 (commit 9b21dcd6a89f38e8ceccb2ede8c9027cb409f6e3) Pass --target i585-unknown-linux-gnu when building for 32-bit linux. We mostly want this for official builds, but Debian needs it too, in both cases to support old machines without SSE2 instruction set support, so while it means developers will have to `rustup target add i585-unknown-linux-gnu` when building for this architecture that is not a common task (most linux devs will be on 64-bit) and it reduces variance and surprise if binaries are distributed. MozReview-Commit-ID: 3mAjWxYGpwZ
browser/config/tooltool-manifests/linux32/releng.manifest
build/moz.configure/rust.configure
--- a/browser/config/tooltool-manifests/linux32/releng.manifest
+++ b/browser/config/tooltool-manifests/linux32/releng.manifest
@@ -11,19 +11,19 @@
 "size": 11189216,
 "digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6",
 "algorithm": "sha512",
 "filename": "gtk3.tar.xz",
 "setup": "setup.sh",
 "unpack": true
 },
 {
-"version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack",
-"size": 131489924,
-"digest": "59f7463a0da38f324daa4ffc2678d78afb4fe0df13248c1d215bcb996ec05e8521155563cde9a8b719a9b98c5feeaf97cc9e8d52c9b95f6b44728870d908d5b6",
+"version": "gecko rustc 1.11.0 (9b21dcd6a 2016-08-15) x86_64+i586",
+"size": 99378568,
+"digest": "ea5ae0a37ab8c583ef3f9a97c45baf0644feed95f1e6191a4456fd42bbd45b218fe4bc528747a63af55ce67c4b6155bd50f312746628b30e41c421f4d54e5417",
 "algorithm": "sha512",
 "filename": "rustc.tar.xz",
 "unpack": true
 },
 {
 "version": "cargo 0.13.0-nightly (e713e7f 2016-08-31)",
 "size": 3245716,
 "digest": "d5bb0d88ce7bb1b5a316d7a8ca6341672f5ee8008fa7754511bf53fabd54c0770e95397232896d6087547891f1143f6968d8b1e106e39800b43defeb0025c7c0",
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -100,17 +100,17 @@ def rust_target(rust_compiler, rustc, ta
             # FreeBSD
             ('x86', 'FreeBSD'): 'i686-unknown-freebsd',
             ('x86_64', 'FreeBSD'): 'x86_64-unknown-freebsd',
             # NetBSD
             ('x86_64', 'NetBSD'): 'x86_64-unknown-netbsd',
             # OpenBSD
             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
             # Linux
-            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
             # 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',