commit b223504c86b01d2e8d80daad4efe8f009e6b8879 Author: Georg Koppen <gk@torproject.org> Date: Thu Nov 7 22:07:02 2019 +0000 Revert "Bug 32053: Work around Rust related reproducibility issues" This reverts commit f1f9fa0286982d1fa486880ad6037e1e7a46457d as it would otherwise cause build bustage on Linux (see: #32426) --- Cargo.toml | 2 +- build/moz.configure/toolchain.configure | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cb317e882847..7a0ba6d7abad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ debug-assertions = true panic = "abort" [profile.release] -opt-level = 1 +opt-level = 2 rpath = false debug-assertions = false panic = "abort" diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index f5a6ea7b3bc3..3bcf403bceec 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1876,8 +1876,8 @@ js_option(env='RUSTC_OPT_LEVEL', nargs=1, help='Rust compiler optimization level (-C opt-level=%s)') -# Use -O1 as a workaround for reproducibility issues for now, see #32053. -imply_option('RUSTC_OPT_LEVEL', '1', when='--enable-release') +# --enable-release kicks in full optimizations. +imply_option('RUSTC_OPT_LEVEL', '2', when='--enable-release') @depends('RUSTC_OPT_LEVEL', moz_optimize)