This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch main in repository builders/tor-browser-build.
commit 3448858ba25066ed5329b93b829ff12347eaac62 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Aug 11 19:28:24 2022 +0200
Bug 29322: Use mingw-w64/clang toolchain to build OpenSSL --- projects/openssl/build | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/projects/openssl/build b/projects/openssl/build index f8c4cbf..094b7cd 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -8,15 +8,22 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osname") == "linux-i686" -%] export CC='gcc -m32' [% END %] +# OpenSSL prepends the host triple to $CC [% IF c("var/osx") -%] # Tricking OpenSSL into using our clang as cross-compiler ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] +[% IF c("var/windows") -%] + # Otherwise it falls back to gcc. This way we can remain generic and switch + # from GCC to Clang and vice versa. + export CC=cc +[% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] -make -make DESTDIR="$distdir" install +make -j[% c("num_procs") %] +# https://github.com/openssl/openssl/issues/8170 +make -j[% c("num_procs") %] DESTDIR="$distdir" install cd /var/tmp/dist ln -s '[% c("var/openssldir") %]' openssl/openssl [% c('tar', {