summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-28 07:41:36 +0200
committerGitHub <noreply@github.com>2018-05-28 07:41:36 +0200
commit10623b2a31db629e42e9519c8428c5f6f23c8203 (patch)
tree280bbaf00fbc1d4078172ae871ac5a4f954b2cf2
parentc8409cc60bd54586e4a484c7ad15a2c408198dd7 (diff)
parentde0157a6c38d185dbfc12736fd71ccfd287a3e62 (diff)
downloadUXP-10623b2a31db629e42e9519c8428c5f6f23c8203.tar
UXP-10623b2a31db629e42e9519c8428c5f6f23c8203.tar.gz
UXP-10623b2a31db629e42e9519c8428c5f6f23c8203.tar.lz
UXP-10623b2a31db629e42e9519c8428c5f6f23c8203.tar.xz
UXP-10623b2a31db629e42e9519c8428c5f6f23c8203.zip
Merge pull request #398 from MoonchildProductions/revert-397-buildsystem-work
Revert "Only display SSE2 error dialog on 32-bit Linux"
-rw-r--r--application/palemoon/confvars.sh8
-rwxr-xr-xbrowser/confvars.sh8
2 files changed, 6 insertions, 10 deletions
diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh
index fbd412eb5..d1d2ce065 100644
--- a/application/palemoon/confvars.sh
+++ b/application/palemoon/confvars.sh
@@ -98,11 +98,9 @@ if test "$OS_ARCH" = "WINNT" -o \
MOZ_BUNDLED_FONTS=1
fi
-# 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
+# Display an error on non-SSE2 Linux systems
+if test "$OS_ARCH" = "Linux"; then
+ MOZ_LINUX_SSE2_STARTUP_ERROR=1
fi
# Short-circuit a few services to be removed
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 3135f6b63..e8b911da3 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -18,11 +18,9 @@ if test "$OS_ARCH" = "WINNT"; then
MOZ_MAINTENANCE_SERVICE=
fi
-# 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
+# Display an error on non-SSE2 Linux systems
+if test "$OS_ARCH" = "Linux"; then
+ MOZ_LINUX_SSE2_STARTUP_ERROR=1
fi
# For Basilisk we want to use 52.9.YYYY.MM.DD as MOZ_APP_VERSION in release