diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-28 07:41:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 07:41:36 +0200 |
| commit | 10623b2a31db629e42e9519c8428c5f6f23c8203 (patch) | |
| tree | 280bbaf00fbc1d4078172ae871ac5a4f954b2cf2 | |
| parent | c8409cc60bd54586e4a484c7ad15a2c408198dd7 (diff) | |
| parent | de0157a6c38d185dbfc12736fd71ccfd287a3e62 (diff) | |
| download | uxp-10623b2a31db629e42e9519c8428c5f6f23c8203.tar.gz | |
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.sh | 8 | ||||
| -rwxr-xr-x | browser/confvars.sh | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index fbd412eb57..d1d2ce065a 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 3135f6b636..e8b911da35 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 |