diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-27 17:54:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-27 17:54:50 +0200 |
| commit | 7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2 (patch) | |
| tree | 3c40aedae6cb2551066b406cec3559dc1a488baf /browser/app/Makefile.in | |
| parent | a65c26ccf590103a07174d9722ef86bcaac877a6 (diff) | |
| parent | 3c3c85983f96ed48fb6a2c16df712dd229c1f358 (diff) | |
| download | UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.tar UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.tar.gz UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.tar.lz UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.tar.xz UXP-7840c750dbfd3f1b2ab3b4f0db561cafdc7dcfe2.zip | |
Merge pull request #395 from trav90/buildsystem-work
Always build with SSE2 support & display an error if not available
Diffstat (limited to 'browser/app/Makefile.in')
| -rw-r--r-- | browser/app/Makefile.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index d807b4337..ca87f0995 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -23,6 +23,14 @@ NSDISTMODE = copy include $(topsrcdir)/config/config.mk +# If we are trying to show an error dialog about the lack of SSE2 support, +# make sure that code itself doesn't use SSE2. +ifdef MOZ_LINUX_SSE2_STARTUP_ERROR +CXXFLAGS := $(filter-out -march=% -msse2 -mfpmath=sse,$(CXXFLAGS)) +CXX := $(filter-out -march=% -msse2 -mfpmath=sse,$(CXX)) +CXXFLAGS += -msse -mno-sse2 -mfpmath=387 +endif + ifeq ($(OS_ARCH),WINNT) # Rebuild firefox.exe if the manifest changes - it's included by splash.rc. # (this dependency should really be just for firefox.exe, not other targets) |