Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
24cdd7e4
by Pier Angelo Vendrame at 2025-12-02T20:55:23+01:00
2 changed files:
Changes:
| ... | ... | @@ -129,14 +129,6 @@ echo "Starting ./mach build $(date)" |
| 129 | 129 | export MOZ_PKG_MAC_ICON=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.VolumeIcon.icns
|
| 130 | 130 | [% END -%]
|
| 131 | 131 | |
| 132 | - [% IF c("var/linux") -%]
|
|
| 133 | - # Compression differs with 1 or 2+ threads,
|
|
| 134 | - # so we'll want to have at least 2 threads, but otherwise respect num_procs.
|
|
| 135 | - #
|
|
| 136 | - # Without this, compression takes 20min+
|
|
| 137 | - export XZ_DEFAULTS="-T[% c("num_procs") > 1 ? c("num_procs") : '2' %]"
|
|
| 138 | - [% END -%]
|
|
| 139 | - |
|
| 140 | 132 | # Package the browser and also create all the test artifacts.
|
| 141 | 133 | #
|
| 142 | 134 | # MOZ_SIMPLE_PACKAGE_NAME will force all artifact files to start with "target",
|
| ... | ... | @@ -261,9 +261,11 @@ var: |
| 261 | 261 | [% IF c("container/global_disable") -%]
|
| 262 | 262 | rm -Rf /var/tmp/build /var/tmp/dist
|
| 263 | 263 | [% END -%]
|
| 264 | + # Single vs multi-threaded might produce different results, so force at
|
|
| 265 | + # least two threads for reproducibility purposes.
|
|
| 266 | + export XZ_DEFAULTS="-T[% c("num_procs") > 1 ? c("num_procs") : '2' %]"
|
|
| 264 | 267 | [% IF c("compress_tar") == 'zst' -%]
|
| 265 | - # Always set ZSTD_NBTHREADS > 1 to make archives reproducible
|
|
| 266 | - # (single vs multi-threaded might produce different results)
|
|
| 268 | + # Same as xz.
|
|
| 267 | 269 | export ZSTD_NBTHREADS=[% c("num_procs") > 1 ? c("num_procs") : '2' %]
|
| 268 | 270 | [% END -%]
|
| 269 | 271 |