[tor-commits] [tor-browser-build/master] Use Rust and LLVM for Stylo bindgen in Firefox

[gk at torproject.org]

commit b5a67ed318c316c1c5258e2f5e793abbe8bf84ee
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Mon May 28 09:54:37 2018 -0400

    Use Rust and LLVM for Stylo bindgen in Firefox
---
 projects/firefox/build  | 9 +++++++++
 projects/firefox/config | 6 ++++++
 projects/llvm/config    | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 88bffc2..a9d5125 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -48,6 +48,15 @@ EOF
 #  export SELFRANDO_skip_shuffle=
 #[% END -%]
 
+[% IF c("var/linux") %]
+  mkdir -p /var/tmp/dist
+  tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
+  export PATH="/var/tmp/dist/rust/bin:$PATH"
+  # Add llvm so stylo can build
+  tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %]
+  export LLVM_CONFIG="/var/tmp/dist/llvm/bin/llvm-config"
+[% END -%]
+
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 
 [% IF c("var/osx") %]
diff --git a/projects/firefox/config b/projects/firefox/config
index 0692ead..d6b8313 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -97,3 +97,9 @@ input_files:
     enable: '[% c("var/windows") %]'
   - filename: STL_win64.patch
     enable: '[% c("var/windows-x86_64") %]'
+  - project: rust
+    name: rust
+    enable: '[% c("var/linux") %]'
+  - project: llvm
+    name: llvm
+    enable: '[% c("var/linux") %]'
diff --git a/projects/llvm/config b/projects/llvm/config
index daa779d..44252b4 100644
--- a/projects/llvm/config
+++ b/projects/llvm/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 3.8.0
+version: 3.9.1
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 
 var: