1 files changed, 22 insertions, 26 deletions
diff --git a/mozconfig b/mozconfig
index e5b0203a9650..91f6cbc09d55 100644
--- a/mozconfig
+++ b/mozconfig
@@ -1,10 +1,8 @@
-ac_add_options --enable-application=browser
-
-ac_add_options --prefix=/usr
-ac_add_options --enable-hardening
-ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
-ac_add_options --disable-bootstrap
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs}
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
+. $topsrcdir/browser/config/mozconfig
 
 # Branding
 ac_add_options --enable-release
@@ -13,14 +11,25 @@ ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.archlinux
 ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-export MOZ_SOURCE_REPO=https://hg.mozilla.org/mozilla-unified
-export MOZ_ADDON_SIGNING=1
-export MOZ_REQUIRE_SIGNING=1
-export BUILD_OFFICIAL=1
+
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+
+# Features
+ac_add_options --enable-jack
+ac_add_options --enable-alsa
+ac_add_options --enable-crashreporter
+ac_add_options --without-wasm-sandboxed-libraries
 
 
+# Optimisation
+ac_add_options --prefix=/usr
+ac_add_options --enable-hardening
+ac_add_options --enable-optimize
+ac_add_options --enable-rust-simd
+ac_add_options --disable-bootstrap
+ac_add_options --enable-lto
+
 # System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -41,17 +50,4 @@ ac_add_options --enable-necko-wifi
 ac_add_options --disable-libproxy
 #ac_add_options --enable-shared-js
 
-# Features
-ac_add_options --enable-jack
-ac_add_options --enable-alsa
-ac_add_options --enable-crashreporter
-
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-
-ac_add_options --without-wasm-sandboxed-libraries
-
 #STRIP_FLAGS="--strip-debug"
- 
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'