[tbb-commits] [tor-browser-build/master] Bug 32435: Add WebAssembly support for RLBox

[boklm at torproject.org]

commit a1eab9035af5b5d6cc8ab21615676f9f237c074f
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jan 21 08:03:42 2020 +0000

    Bug 32435: Add WebAssembly support for RLBox
---
 projects/clang/build | 5 ++++-
 rbm.conf             | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/projects/clang/build b/projects/clang/build
index 825b21e..d95e9af 100644
--- a/projects/clang/build
+++ b/projects/clang/build
@@ -40,7 +40,10 @@ cd llvm
 export LLVM_HOME=$(pwd)
 mkdir build
 cd build
-cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME
+cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \
+                             -DCMAKE_BUILD_TYPE:STRING=Release \
+     [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%]
+                             $LLVM_HOME
 make -j[% c("buildconf/num_procs") %]
 make install
 cd /var/tmp/dist
diff --git a/rbm.conf b/rbm.conf
index 73c617b..213971e 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -262,6 +262,8 @@ targets:
     var:
       linux-x86_64: 1
       osname: linux-x86_64
+      # We only support RLBox on the nightly channel and x86_64 for now
+      rlbox: '[% c("var/nightly") %]'
   linux-i686:
     arch: i686
     var: