diff options
| author | Ehsan Akhgari <ehsan@mozilla.com> | 2014-01-11 21:39:58 -0800 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan@mozilla.com> | 2014-01-11 21:39:58 -0800 |
| commit | 65a6c1fc4e8aaaef1db75c63a8f0a4280f98659f (patch) | |
| tree | aaaccdfe519691c8d7178a95fd74679dbf88197c | |
| parent | f1bc4954a09f2d2a34812b501aa4a6e7980fca5e (diff) | |
| download | nss-hg-65a6c1fc4e8aaaef1db75c63a8f0a4280f98659f.tar.gz | |
Bug 918164: Add -FS option to NSS config when using VS2013 so that parallel builds do not break, r=briansmith
| -rw-r--r-- | coreconf/WIN32.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk index eeab70d79..a552f94d7 100644 --- a/coreconf/WIN32.mk +++ b/coreconf/WIN32.mk @@ -41,6 +41,7 @@ else _CC_BUILD := $(word 4,$(_CC_VERSION_WORDS)) _MSC_VER = $(_CC_VMAJOR)$(_CC_VMINOR) _MSC_VER_6 = 1200 + _MSC_VER_GTE18 := $(shell expr $(_MSC_VER) \>= 1800) ifeq ($(_CC_VMAJOR),14) # -DYNAMICBASE is only supported on VC8SP1 or newer, # so be very specific here! @@ -171,6 +172,10 @@ ifneq ($(_MSC_VER),$(_MSC_VER_6)) OS_CFLAGS += -we4002 -we4003 -we4004 -we4006 -we4009 -we4013 \ -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4054 -we4063 \ -we4064 -we4078 -we4087 -we4090 -we4098 -we4390 -we4551 -we4553 -we4715 + + ifeq ($(_MSC_VER_GTE18),1) + OS_CFLAGS += -FS + endif endif # !MSVC6 endif # NS_USE_GCC |