commit e923451e21dcc2810f6676fb829c5022707a6944
Author: Georg Koppen <gk(a)torproject.org>
Date: Tue Nov 17 09:40:23 2020 +0000
Bug 40155: Update toolchain for Fenix 84
We need to bump Rust to 1.47.0
---
projects/rust/build | 12 +++++++-----
projects/rust/config | 9 +++------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/projects/rust/build b/projects/rust/build
index 8accf56..13fe0aa 100644
--- a/projects/rust/build
+++ b/projects/rust/build
@@ -36,11 +36,13 @@ mkdir /var/tmp/build
tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %]
cd /var/tmp/build/rustc-[% c('version') %]-src
-# LLVM has reproducibility issues when optimizing bitcode, which we need to
-# patch. See: #32053 for more details.
-cd src/llvm-project
-patch -p1 < $rootdir/[% c('input_files_by_name/43909') %]
-cd ../../
+[% IF ! c("var/android") %]
+ # LLVM has reproducibility issues when optimizing bitcode, which we need to
+ # patch. See: #32053 for more details.
+ cd src/llvm-project
+ patch -p1 < $rootdir/[% c('input_files_by_name/43909') %]
+ cd ../../
+[% END %]
[% IF c("var/windows-i686") %]
# Cross-compiling for Windows 32bit is currently not possible without any
diff --git a/projects/rust/config b/projects/rust/config
index d4529c8..eb28517 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -11,8 +11,8 @@ var:
targets:
android:
var:
- current_version: '[% IF pc(c("origin_project"), "var/application_services") %]1.45.2[% ELSE %]1.43.0[% END %]'
- previous_version: '[% IF pc(c("origin_project"), "var/application_services") %]1.44.1[% ELSE %]1.42.0[% END %]'
+ current_version: 1.47.0
+ previous_version: 1.46.0
arch_deps:
- libssl-dev
- pkg-config
@@ -99,7 +99,4 @@ input_files:
enable: '[% c("var/windows-i686") %]'
- filename: 43909.patch
name: 43909
- enable: '[% ! pc(c("origin_project"), "var/application_services") %]'
- - filename: 43909_145.patch
- name: 43909
- enable: '[% pc(c("origin_project"), "var/application_services") %]'
+ enable: '[% ! c("var/android") %]'