diff --git a/.github/workflows/macos-alpha-build.yml b/.github/workflows/macos-alpha-build.yml index 67bd6a8fd..3bee97eef 100644 --- a/.github/workflows/macos-alpha-build.yml +++ b/.github/workflows/macos-alpha-build.yml @@ -83,7 +83,11 @@ jobs: - name: build Zen env: SURFER_COMPAT: ${{ matrix.arch == 'x64' }} - run: sh .github/workflows/src/alpha-build.sh + run: | + if test "${{ matrix.arch }}" = "x64"; then + export ZEN_DISABLE_LTO=1 + fi + sh .github/workflows/src/alpha-build.sh - name: Rebuild Zen if failed if: failure() diff --git a/configs/common/mozconfig b/configs/common/mozconfig index 81fc71eb3..b2a02e7f1 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -48,9 +48,11 @@ if test "$ZEN_RELEASE"; then ac_add_options --disable-vtune - export MOZ_LTO=1 - ac_add_options MOZ_LTO=1 - ac_add_options --enable-lto=full,cross + if ! test "$ZEN_DISABLE_LTO"; then + export MOZ_LTO=1 + ac_add_options MOZ_LTO=1 + ac_add_options --enable-lto=full,cross + fi ac_add_options --enable-jemalloc diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig index c179a432e..63ce1b4d0 100644 --- a/configs/macos/mozconfig +++ b/configs/macos/mozconfig @@ -13,10 +13,6 @@ if test "$SURFER_COMPAT" = "true"; then ac_add_options MOZ_PGO=1 ac_add_options --target=x86_64-apple-darwin - # it crashes the builds - unset MOZ_LTO - ac_add_options --disable-lto - ac_add_options --enable-wasm-avx ac_add_options --enable-optimize="-O3 -march=x86-64-v3"