[tor-commits] [tor-browser-build/master] Bug 40019: Workaround for missing a proper compiler-rt

[sysrqb at torproject.org]

commit cb9c548344966ea3c50bb56a71459fecff3cc18d
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jul 10 05:57:56 2020 +0000

    Bug 40019: Workaround for missing a proper compiler-rt
    
    To get nightly builds going we use Mozilla's cross-compiled compiler-rt
    for now.
---
 projects/firefox/build  | 5 +++++
 projects/firefox/config | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/projects/firefox/build b/projects/firefox/build
index a9f86bf..1fe4adf 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -14,6 +14,11 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %]
   cp /var/tmp/dist/mingw-w64/gcclibs/{libssp.a,libssp_nonshared.a} /var/tmp/dist/mingw-w64-clang/[% c("arch") %]-w64-mingw32/lib/
 [% END -%]
 
+[% IF c("var/osx") %]
+  mkdir -p /var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/darwin
+  mv libclang_rt.osx.a /var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/darwin
+[% END -%]
+
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %]
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %]
diff --git a/projects/firefox/config b/projects/firefox/config
index 2cc734b..874d7d2 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -182,3 +182,9 @@ input_files:
     # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin
   - filename: namecoin-etld.patch
     enable: '[% c("var/namecoin") %]'
+    # The library is extracted from Mozilla's officially used Clang, downloaded
+    # from https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/TYTqgyybSLmp0O0GcIl8Xw/artifacts/public/build/clang.tar.zst.
+    # Its SHA-256 sum is 7b0a6e60f102d3dbf618ae9e25d990d4dc72c76eb5accb5974ec70c11ff7e049.
+  - URL: https://people.torproject.org/~gk/mirrors/sources/libclang_rt.osx.a
+    sha256sum: 33541fb054e7dc372b5e9708bbcc175561d7fdbc9b00bf964e0c60b82bd8165a
+    enable: '[% c("var/osx") %]'