Skip to content

Commit

Permalink
Remove LTO disabling for x86_64 in Linux release build and fix CXXFLA…
Browse files Browse the repository at this point in the history
…GS in mozconfig
  • Loading branch information
mr-cheff committed Dec 22, 2024
1 parent a83bfa7 commit e4b7133
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/linux-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ jobs:
continue-on-error: true
run: |
export SURFER_PLATFORM="linux"
if test "${{ matrix.arch }}" = "x86_64-v3"; then
# TODO: Fix this!
export ZEN_DISABLE_LTO=1
fi
sh .github/workflows/src/release-build.sh
- name: Build again if it failed
Expand Down
2 changes: 1 addition & 1 deletion configs/linux/mozconfig
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ elif test "$ZEN_RELEASE"; then

export CFLAGS="$CFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -mfma -maes -mpopcnt -mpclmul"
export CPPFLAGS="$CPPFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -mfma -maes -mpopcnt -mpclmul"
export CXXFLAGS="$CXXFLAGS -O3 -fno-slp-vectorize -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -mfma -maes -mpopcnt -mpclmul"
export CXXFLAGS="$CXXFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -mavx2 -mfma -maes -mpopcnt -mpclmul"
export LDFLAGS="$LDFLAGS -Wl,-O3 -Wl,-mllvm,-fp-contract=fast -march=x86-64-v3"
export RUSTFLAGS="$RUSTFLAGS -C target-cpu=x86-64-v3 -C target-feature=+sse4.1 -C target-feature=+avx2 -C codegen-units=1 -Clink-args=--icf=safe"
fi
Expand Down
3 changes: 3 additions & 0 deletions configs/windows/mozconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ ac_add_options --disable-maintenance-service
ac_add_options --disable-bits-download

if test "$SURFER_COMPAT" = "x86_64"; then
# FIXME: For some reason, the clang plugin is not working on generic x86_64 builds
ac_add_options --disable-clang-plugin

ac_add_options --target=x86_64-pc-windows-msvc
ac_add_options --enable-eme=widevine

Expand Down

0 comments on commit e4b7133

Please sign in to comment.