From 7a26ade0a65a3aebb184d9b6a22a2b16823da130 Mon Sep 17 00:00:00 2001 From: trav90 Date: Sun, 27 May 2018 17:23:09 -0500 Subject: Only display SSE2 error dialog on 32-bit Linux All 64bit CPU's support SSE2 so there's no reason to have this code on 64-bit builds. --- application/palemoon/confvars.sh | 8 +++++--- browser/confvars.sh | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index d1d2ce065..fbd412eb5 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -98,9 +98,11 @@ if test "$OS_ARCH" = "WINNT" -o \ MOZ_BUNDLED_FONTS=1 fi -# Display an error on non-SSE2 Linux systems -if test "$OS_ARCH" = "Linux"; then - MOZ_LINUX_SSE2_STARTUP_ERROR=1 +# Display an error on non-SSE2 32-bit Linux systems +if ! test "$HAVE_64BIT_BUILD"; then + if test "$OS_ARCH" = "Linux"; then + MOZ_LINUX_SSE2_STARTUP_ERROR=1 + fi fi # Short-circuit a few services to be removed diff --git a/browser/confvars.sh b/browser/confvars.sh index e8b911da3..3135f6b63 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -18,9 +18,11 @@ if test "$OS_ARCH" = "WINNT"; then MOZ_MAINTENANCE_SERVICE= fi -# Display an error on non-SSE2 Linux systems -if test "$OS_ARCH" = "Linux"; then - MOZ_LINUX_SSE2_STARTUP_ERROR=1 +# Display an error on non-SSE2 32-bit Linux systems +if ! test "$HAVE_64BIT_BUILD"; then + if test "$OS_ARCH" = "Linux"; then + MOZ_LINUX_SSE2_STARTUP_ERROR=1 + fi fi # For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release -- cgit v1.2.3