diff options
| author | David Major <dmajor@mozilla.com> | 2015-08-15 15:37:50 -0700 |
|---|---|---|
| committer | David Major <dmajor@mozilla.com> | 2015-08-15 15:37:50 -0700 |
| commit | 03d2e2d3d9d618778194c3759dee4bc625310f55 (patch) | |
| tree | 4a75fea592eb7d66e05c58f56a5e188d0127df96 /coreconf/WIN32.mk | |
| parent | a7642f29f1a402daf8524785dfd03512439b429e (diff) | |
| download | nss-hg-03d2e2d3d9d618778194c3759dee4bc625310f55.tar.gz | |
Bug 1193467: Allow SSE2 on clang-cl builds. r=wtc.
Diffstat (limited to 'coreconf/WIN32.mk')
| -rw-r--r-- | coreconf/WIN32.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index 092bfd31c..97db9ef92 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -214,10 +214,12 @@ ifdef USE_64 else DEFINES += -D_X86_ # VS2012 defaults to -arch:SSE2. Use -arch:IA32 to avoid requiring - # SSE2. + # SSE2. Clang-cl gets confused by -arch:IA32, so SSE2 is allowed. # Use subsystem 5.01 to allow running on Windows XP. ifeq ($(_MSC_VER_GE_11),1) - OS_CFLAGS += -arch:IA32 + ifneq ($(CLANG_CL),1) + OS_CFLAGS += -arch:IA32 + endif LDFLAGS += -SUBSYSTEM:CONSOLE,5.01 endif endif |