diff options
| author | David Major <dmajor@mozilla.com> | 2014-07-11 12:13:52 -0700 |
|---|---|---|
| committer | David Major <dmajor@mozilla.com> | 2014-07-11 12:13:52 -0700 |
| commit | 157b74e28ac69d31c165dbc64341d322959cf4f8 (patch) | |
| tree | 08bbfc380ba871cacbdc3a8583f81bf86c8a28d5 /coreconf/WIN32.mk | |
| parent | 199b36b029f91f6ff5de03db805a33339eecceda (diff) | |
| download | nss-hg-157b74e28ac69d31c165dbc64341d322959cf4f8.tar.gz | |
Bug 836658: Use -arch:IA32 on VS2012 to avoid requiring SSE2. r=wtc.
Diffstat (limited to 'coreconf/WIN32.mk')
| -rw-r--r-- | coreconf/WIN32.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index afece4993..740a3c70c 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -44,6 +44,8 @@ else # VC10 (2010) is 16.00.30319.01, VC10SP1 is 16.00.40219.01. _MSC_VER_GE_10SP1 := $(shell expr $(_MSC_VER) \> 1600 \| \ $(_MSC_VER) = 1600 \& $(_CC_RELEASE) \>= 40219) + # VC11 (2012). + _MSC_VER_GE_11 := $(shell expr $(_MSC_VER) \>= 1700) # VC12 (2013). _MSC_VER_GE_12 := $(shell expr $(_MSC_VER) \>= 1800) ifeq ($(_CC_VMAJOR),14) @@ -177,6 +179,11 @@ ifneq ($(_MSC_VER),$(_MSC_VER_6)) -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4054 -we4063 \ -we4064 -we4078 -we4087 -we4090 -we4098 -we4390 -we4551 -we4553 -we4715 + # VS2012 defaults to -arch:SSE2. Use -arch:IA32 to avoid requiring SSE2. + ifeq ($(_MSC_VER_GE_11),1) + OS_CFLAGS += -arch:IA32 + endif + ifeq ($(_MSC_VER_GE_12),1) OS_CFLAGS += -FS endif |