update mozconfigs and installer

Alex313031 · May 20, 2024 · 2f001e9 · 2f001e9
1 parent 28c3e7f
commit 2f001e9
Show file tree

Hide file tree

Showing 22 changed files with 612 additions and 56 deletions.
diff --git a/mozconfigs/context.py b/mozconfigs/context.py
@@ -2484,14 +2484,6 @@ def aggregate(files):
         See ``DEFINES`` for specifics.
         """,
     ),
-    "WASM_LIBS": (
-        List,
-        list,
-        """Wasm system link libraries.
-
-        This variable contains a list of wasm system libaries to link against.
-        """,
-    ),
     "CMFLAGS": (
         List,
         list,

diff --git a/mozconfigs/mozconfig b/mozconfigs/mozconfig
@@ -81,7 +81,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-arm64 b/mozconfigs/mozconfig-arm64
@@ -79,7 +79,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-avx2 b/mozconfigs/mozconfig-avx2
@@ -82,7 +82,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-debug b/mozconfigs/mozconfig-debug
@@ -64,7 +64,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-macos-arm64 b/mozconfigs/mozconfig-macos-arm64
@@ -75,7 +75,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j5"
-export MOZ_MAKE_FLAGS="-j5"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-macos-arm64-cross b/mozconfigs/mozconfig-macos-arm64-cross
@@ -77,7 +77,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j5"
-export MOZ_MAKE_FLAGS="-j5"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-macos-x64 b/mozconfigs/mozconfig-macos-x64
@@ -77,7 +77,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j5"
-export MOZ_MAKE_FLAGS="-j5"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-macos-x64-cross b/mozconfigs/mozconfig-macos-x64-cross
@@ -66,8 +66,8 @@ export MOZ_REQUIRE_SIGNING=
 export MOZ_TELEMETRY_REPORTING=
 
 # API Keys
-ac_add_options --with-google-location-service-api-keyfile=ga
-ac_add_options --with-google-safebrowsing-api-keyfile=ga
+ac_add_options --with-google-location-service-api-keyfile=@TOPSRCDIR@/ga
+ac_add_options --with-google-safebrowsing-api-keyfile=@TOPSRCDIR@/ga
 
 # Branding
 ac_add_options --with-app-name=mercury
@@ -79,7 +79,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j5"
-export MOZ_MAKE_FLAGS="-j5"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-sse3 b/mozconfigs/mozconfig-sse3
@@ -81,7 +81,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-sse4 b/mozconfigs/mozconfig-sse4
@@ -81,7 +81,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-win b/mozconfigs/mozconfig-win
@@ -27,7 +27,7 @@ ac_add_options --enable-install-strip
 ac_add_options --enable-clang-plugin
 ac_add_options --enable-lto
 ac_add_options --enable-wasm-avx
-ac_add_options --enable-optimize="-O2 -O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -Xclang -O3"
+ac_add_options --enable-optimize="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -Xclang -O3"
 ac_add_options --enable-rust-simd
 ac_add_options --enable-hardening
 #ac_add_options --disable-trace-logging
@@ -70,9 +70,6 @@ export MOZ_DATA_REPORTING=0
 export MOZ_REQUIRE_SIGNING=
 export MOZ_TELEMETRY_REPORTING=
 
-# Installer
-export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT"
-
 # API Keys
 ac_add_options --with-google-location-service-api-keyfile=@TOPSRCDIR@/ga
 ac_add_options --with-google-safebrowsing-api-keyfile=@TOPSRCDIR@/ga
@@ -87,7 +84,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1
@@ -112,9 +108,9 @@ elif test "$USE_PGO"; then
 fi
 
 # Compiler, Linker, and Rust flags
-export CFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX"
-export CPPFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX"
-export CXXFLAGS="-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX"
+export CFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX"
+export CPPFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX"
+export CXXFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /clang:-O3 /arch:AVX"
 export LDFLAGS="-Wl,-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes"
 POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 export RUSTFLAGS="-C target-feature=+avx -C codegen-units=1"

diff --git a/mozconfigs/mozconfig-win-avx2 b/mozconfigs/mozconfig-win-avx2
@@ -27,7 +27,7 @@ ac_add_options --enable-install-strip
 ac_add_options --enable-clang-plugin
 ac_add_options --enable-lto
 ac_add_options --enable-wasm-avx
-ac_add_options --enable-optimize="-O2 -O3 -march=x86-64-v3 -Xclang -O3"
+ac_add_options --enable-optimize="-O2 -march=x86-64-v3 -Xclang -O3"
 ac_add_options --enable-rust-simd
 ac_add_options --enable-hardening
 #ac_add_options --disable-trace-logging
@@ -70,9 +70,6 @@ export MOZ_DATA_REPORTING=0
 export MOZ_REQUIRE_SIGNING=
 export MOZ_TELEMETRY_REPORTING=
 
-# Installer
-export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT"
-
 # API Keys
 ac_add_options --with-google-location-service-api-keyfile=@TOPSRCDIR@/ga
 ac_add_options --with-google-safebrowsing-api-keyfile=@TOPSRCDIR@/ga
@@ -87,7 +84,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1
@@ -112,9 +108,9 @@ elif test "$USE_PGO"; then
 fi
 
 # Compiler, Linker, and Rust flags
-export CFLAGS="-O3 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2"
-export CPPFLAGS="-O3 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2"
-export CXXFLAGS="-O3 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2"
+export CFLAGS="-O2 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2"
+export CPPFLAGS="-O2 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2"
+export CXXFLAGS="-O2 -march=x86-64-v3 /clang:-O3 /clang:-ffp-contract=fast /arch:AVX2"
 export LDFLAGS="-Wl,-O3 -march=x86-64-v3"
 POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 export RUSTFLAGS="-C target-cpu=haswell -C target-feature=+avx2 -C codegen-units=1"

diff --git a/mozconfigs/mozconfig-win-avx2-cross b/mozconfigs/mozconfig-win-avx2-cross
@@ -91,7 +91,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-win-cross b/mozconfigs/mozconfig-win-cross
@@ -91,7 +91,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-win-debug b/mozconfigs/mozconfig-win-debug
@@ -72,7 +72,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1

diff --git a/mozconfigs/mozconfig-win-sse3 b/mozconfigs/mozconfig-win-sse3
@@ -27,7 +27,7 @@ ac_add_options --enable-install-strip
 ac_add_options --enable-clang-plugin
 ac_add_options --enable-lto
 #ac_add_options --enable-wasm-avx
-ac_add_options --enable-optimize="-O2 -O3 -msse3 -Xclang -O3"
+ac_add_options --enable-optimize="-O2 -msse3 -Xclang -O3"
 ac_add_options --enable-rust-simd
 ac_add_options --enable-hardening
 #ac_add_options --disable-trace-logging
@@ -70,9 +70,6 @@ export MOZ_DATA_REPORTING=0
 export MOZ_REQUIRE_SIGNING=
 export MOZ_TELEMETRY_REPORTING=
 
-# Installer
-export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT"
-
 # API Keys
 ac_add_options --with-google-location-service-api-keyfile=@TOPSRCDIR@/ga
 ac_add_options --with-google-safebrowsing-api-keyfile=@TOPSRCDIR@/ga
@@ -87,7 +84,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1
@@ -112,9 +108,9 @@ elif test "$USE_PGO"; then
 fi
 
 # Compiler, Linker, and Rust flags
-export CFLAGS="-O3 -msse3 /clang:-O3"
-export CPPFLAGS="-O3 -msse3 /clang:-O3"
-export CXXFLAGS="-O3 -msse3 /clang:-O3"
+export CFLAGS="-O2 -msse3 /clang:-O3"
+export CPPFLAGS="-O2 -msse3 /clang:-O3"
+export CXXFLAGS="-O2 -msse3 /clang:-O3"
 export LDFLAGS="-Wl,-O3 -msse3"
 POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 export RUSTFLAGS="-C target-feature=+sse3 -C codegen-units=1"

diff --git a/mozconfigs/mozconfig-win-sse4 b/mozconfigs/mozconfig-win-sse4
@@ -27,7 +27,7 @@ ac_add_options --enable-install-strip
 ac_add_options --enable-clang-plugin
 ac_add_options --enable-lto
 #ac_add_options --enable-wasm-avx
-ac_add_options --enable-optimize="-O2 -O3 -msse3 -mssse3 -msse4.1 -Xclang -O3"
+ac_add_options --enable-optimize="-O2 -msse3 -mssse3 -msse4.1 -Xclang -O3"
 ac_add_options --enable-rust-simd
 ac_add_options --enable-hardening
 #ac_add_options --disable-trace-logging
@@ -70,9 +70,6 @@ export MOZ_DATA_REPORTING=0
 export MOZ_REQUIRE_SIGNING=
 export MOZ_TELEMETRY_REPORTING=
 
-# Installer
-export WIN32_REDIST_DIR="/c/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.38.33130/x64/Microsoft.VC143.CRT"
-
 # API Keys
 ac_add_options --with-google-location-service-api-keyfile=@TOPSRCDIR@/ga
 ac_add_options --with-google-safebrowsing-api-keyfile=@TOPSRCDIR@/ga
@@ -87,7 +84,6 @@ ac_add_options --with-distribution-id=com.alex313031.mercury
 
 # Make flags (set to number of CPU cores)
 mk_add_options MOZ_MAKE_FLAGS="-j16"
-export MOZ_MAKE_FLAGS="-j16"
 
 # Autoclobber
 mk_add_options AUTOCLOBBER=1
@@ -112,9 +108,9 @@ elif test "$USE_PGO"; then
 fi
 
 # Compiler, Linker, and Rust flags
-export CFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
-export CPPFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
-export CXXFLAGS="-O3 -msse3 -mssse3 -msse4.1 /clang:-O3"
+export CFLAGS="-O2 -msse3 -mssse3 -msse4.1 /clang:-O3"
+export CPPFLAGS="-O2 -msse3 -mssse3 -msse4.1 /clang:-O3"
+export CXXFLAGS="-O2 -msse3 -mssse3 -msse4.1 /clang:-O3"
 export LDFLAGS="-Wl,-O3 -msse3 -mssse3 -msse4.1"
 POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 export RUSTFLAGS="-C target-feature=+sse4.1 -C codegen-units=1"

diff --git a/other-licenses/7zstub/firefox/7zSD.ARM64.sfx b/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
diff --git a/other-licenses/7zstub/firefox/7zSD.Win32.sfx b/other-licenses/7zstub/firefox/7zSD.Win32.sfx