From 04302abf0c8f65441cdf62e4f0eec91c23003feb Mon Sep 17 00:00:00 2001
From: Pier Angelo Vendrame <pierov@torproject.org>
Date: Wed, 26 Oct 2022 22:02:37 +0200
Subject: [PATCH] Bug 40666: Fix compiler depedencies for Firefox on Windows
Removed mingw-w64 as a depdency from Firefox, since we take libssp
directly from mingw-w64-clang (the default compiler for Windows now).
Also, take clang as a depdendency for Firefox only on Linux, since
macOS and Windows contain it in their compiler packages.
---
projects/firefox/build | 10 ++++++----
projects/firefox/config | 4 +---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index b06272f04..4d554f207 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -16,10 +16,9 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %]
export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:$PATH"
-tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
-export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
[% IF c("var/linux") %]
+ tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/python') %]
export PATH="/var/tmp/dist/python/bin:$PATH"
tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
@@ -42,10 +41,13 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
# Copy it over.
# https://searchfox.org/mozilla-central/source/build/build-clang/build-clang.py#890,
# include it directly in our clang
- rtdir=/var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi
[% IF c("var/osx") -%]
rtdir=/var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi
- [% END-%]
+ [% ELSIF c("var/windows") -%]
+ rtdir=/var/tmp/dist/mingw-w64-clang/lib/clang/[% pc("clang", "version") %]/lib/wasi
+ [% ELSE -%]
+ rtdir=/var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi
+ [% END -%]
mkdir -p $rtdir
cp /var/tmp/dist/wasi-sysroot/lib/clang/11.0.0/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir
tar -C /var/tmp/dist -xf [% c('input_files_by_name/lucetc') %]
diff --git a/projects/firefox/config b/projects/firefox/config
index 56b33e5fd..38aef044c 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -162,14 +162,12 @@ input_files:
enable: '[% c("var/linux") %]'
- project: clang
name: clang
+ enable: '[% c("var/linux") %]'
- project: fxc2
name: fxc2
enable: '[% c("var/windows") %]'
target_prepend:
- torbrowser-windows-x86_64
- - name: mingw-w64
- project: mingw-w64
- enable: '[% c("var/windows") %]'
- filename: abicheck.cc
enable: '[% c("var/linux") %]'
- filename: start-firefox
--
GitLab