diff options
| author | Wan-Teh Chang <wtc@google.com> | 2014-08-05 12:35:47 -0700 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2014-08-05 12:35:47 -0700 |
| commit | d0bccea6679d1ec3bd915b9e68d9e0f91ab1bc42 (patch) | |
| tree | fdfeeb9d882946643d17f61677ad731971406cf1 /coreconf/WIN32.mk | |
| parent | 4cafa3a1dea4512faf716d56a8ebb9b419f7ae34 (diff) | |
| download | nss-hg-d0bccea6679d1ec3bd915b9e68d9e0f91ab1bc42.tar.gz | |
Bug 1043108: Remove -arch:IA32 from non-x86 builds. r=kaie.NSS_3_17_BETA2
Diffstat (limited to 'coreconf/WIN32.mk')
| -rw-r--r-- | coreconf/WIN32.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index 740a3c70c..71f2bdaa5 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -179,11 +179,6 @@ 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 @@ -201,6 +196,11 @@ ifdef USE_64 DEFINES += -D_AMD64_ else DEFINES += -D_X86_ + # VS2012 defaults to -arch:SSE2. Use -arch:IA32 to avoid requiring + # SSE2. + ifeq ($(_MSC_VER_GE_11),1) + OS_CFLAGS += -arch:IA32 + endif endif endif ifeq ($(CPU_ARCH), ALPHA) |